ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for drop_lockout_time issue with NULL last_local_call_time DROP leads

Browse Source 
git-svn-id: svn://192.168.202.10@3911 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2025-02-24 22:01:19 +00:00
parent c6118e62c5
commit e65da98e40
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/bin/AST_VDhopper.pl
+4 -3
View File
@@ -22,7 +22,7 @@
# - S = Standard hopper load # - S = Standard hopper load
# - D = Campaign Drop-Run # - D = Campaign Drop-Run
# #
# Copyright (C) 2024 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2025 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGELOG # CHANGELOG
# 50810-1613 - Added database server variable definitions lookup # 50810-1613 - Added database server variable definitions lookup
@@ -111,10 +111,11 @@
# 231126-1748 - Added RQUEUE hopper status # 231126-1748 - Added RQUEUE hopper status
# 231129-1051 - Added daily_phone_number_call_limit campaign setting # 231129-1051 - Added daily_phone_number_call_limit campaign setting
# 240225-0954 - Added AUTONEXT hopper_hold_inserts campaign option # 240225-0954 - Added AUTONEXT hopper_hold_inserts campaign option
# 250224-1641 - Fix for drop_lockout_time issue with NULL last_local_call_time DROP leads
# #
# constants # constants
$build = '240225-0954'; $build = '250224-1641';
$script='AST_VDhopper'; $script='AST_VDhopper';
$DB=0; # Debug flag, set to 0 for no debug messages. Can be overriden with CLI --debug flag $DB=0; # Debug flag, set to 0 for no debug messages. Can be overriden with CLI --debug flag
$US='__'; $US='__';
@@ -2839,7 +2840,7 @@ foreach(@campaign_id)
if ($drop_lockout_time[$i] > 0) if ($drop_lockout_time[$i] > 0)
{ {
$DLseconds[$i] = ($drop_lockout_time[$i] * 3600); $DLseconds[$i] = ($drop_lockout_time[$i] * 3600);
$DLTsql[$i] = "and ( ( (status IN('DROP','XDROP')) and (last_local_call_time < CONCAT(DATE_ADD(NOW(), INTERVAL -$DLseconds[$i] SECOND),' ',CURTIME()) ) ) or (status NOT IN('DROP','XDROP')) )"; $DLTsql[$i] = "and ( ( (status IN('DROP','XDROP')) and ( (last_local_call_time < CONCAT(DATE_ADD(NOW(), INTERVAL -$DLseconds[$i] SECOND),' ',CURTIME()) ) or (last_local_call_time IS NULL) ) ) or (status NOT IN('DROP','XDROP')) )";
if ($DB) {print " drop lockout time $drop_lockout_time[$i]($DLseconds[$i]) defined for $campaign_id[$i]\n";} if ($DB) {print " drop lockout time $drop_lockout_time[$i]($DLseconds[$i]) defined for $campaign_id[$i]\n";}
if ($DBX) {print " |$DLTsql[$i]|\n";} if ($DBX) {print " |$DLTsql[$i]|\n";}
$hopper_begin_output .= " drop lockout time $drop_lockout_time[$i]($DLseconds[$i]) defined for $campaign_id[$i] \n"; $hopper_begin_output .= " drop lockout time $drop_lockout_time[$i]($DLseconds[$i]) defined for $campaign_id[$i] \n";
agc_2-X/trunk/www/agc/vdc_db_query.php
+4 -3
View File
@@ -555,10 +555,11 @@
# 240830-1618 - Added manual_minimum_ring_seconds SIP action lookup code # 240830-1618 - Added manual_minimum_ring_seconds SIP action lookup code
# 240906-1646 - Added testing for stereo_recording campaign option for manual dial calls *NOT PRODUCTION READY* # 240906-1646 - Added testing for stereo_recording campaign option for manual dial calls *NOT PRODUCTION READY*
# 250129-0900 - Fix for PHP8 TypeError # 250129-0900 - Fix for PHP8 TypeError
# 250224-1642 - Fix for drop_lockout_time issue with NULL last_local_call_time DROP leads
# #
$version = '2.14-448'; $version = '2.14-449';
$build = '250129-0900'; $build = '250224-1642';
$php_script = 'vdc_db_query.php'; $php_script = 'vdc_db_query.php';
$mel=1; # Mysql Error Log enabled = 1 $mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=913; $mysql_log_count=913;
@@ -3457,7 +3458,7 @@ if ($ACTION == 'manDiaLnextCaLL')
$DLseconds = ($drop_lockout_time * 3600); $DLseconds = ($drop_lockout_time * 3600);
$DLseconds = floor($DLseconds); $DLseconds = floor($DLseconds);
$DLseconds = intval("$DLseconds"); $DLseconds = intval("$DLseconds");
$DLTsql = "and ( ( (status IN('DROP','XDROP')) and (last_local_call_time < CONCAT(DATE_ADD(NOW(), INTERVAL -$DLseconds SECOND),' ',CURTIME()) ) ) or (status NOT IN('DROP','XDROP')) )"; $DLTsql = "and ( ( (status IN('DROP','XDROP')) and ( (last_local_call_time < CONCAT(DATE_ADD(NOW(), INTERVAL -$DLseconds SECOND),' ',CURTIME()) ) or (last_local_call_time IS NULL) ) ) or (status NOT IN('DROP','XDROP')) )";
} }
$CCLsql=''; $CCLsql='';