From 7036a53e185f665f14e962044c8d457bd95701bf Mon Sep 17 00:00:00 2001 From: mattf Date: Fri, 15 Jan 2010 21:18:48 +0000 Subject: [PATCH] small manual dial logging fix git-svn-id: svn://192.168.202.10@1306 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/branches/agc_2.2.0/bin/FastAGI_log.pl | 3 ++- agc_2-X/branches/agc_2.2.0/www/agc/vdc_db_query.php | 10 ++++++++-- agc_2-X/trunk/bin/FastAGI_log.pl | 3 ++- agc_2-X/trunk/www/agc/vdc_db_query.php | 10 ++++++++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/agc_2-X/branches/agc_2.2.0/bin/FastAGI_log.pl b/agc_2-X/branches/agc_2.2.0/bin/FastAGI_log.pl index e6727b45..8382050b 100644 --- a/agc_2-X/branches/agc_2.2.0/bin/FastAGI_log.pl +++ b/agc_2-X/branches/agc_2.2.0/bin/FastAGI_log.pl @@ -583,6 +583,7 @@ sub process_request } ### get uniqueid and start_epoch from the call_log table + $CALLunique_id = $unique_id; $stmtA = "SELECT uniqueid,start_epoch,channel FROM call_log where uniqueid='$unique_id';"; if ($callerid =~ /^M/) {$stmtA = "SELECT uniqueid,start_epoch,channel FROM call_log where caller_code='$callerid' and channel NOT LIKE \"Local\/%\";";} @@ -616,7 +617,7 @@ sub process_request $affected_rows = $dbhA->do($stmtA); } - $stmtA = "DELETE from live_inbound where uniqueid='$unique_id' and server_ip='$VARserver_ip'"; + $stmtA = "DELETE from live_inbound where uniqueid IN('$unique_id','$CALLunique_id') and server_ip='$VARserver_ip'"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $affected_rows = $dbhA->do($stmtA); diff --git a/agc_2-X/branches/agc_2.2.0/www/agc/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/www/agc/vdc_db_query.php index 5ab415a9..07056e0a 100644 --- a/agc_2-X/branches/agc_2.2.0/www/agc/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/www/agc/vdc_db_query.php @@ -236,7 +236,7 @@ $version = '2.2.0-139'; $build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=298; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2430,7 +2430,7 @@ if ($ACTION == 'manDiaLlookCaLL') $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} echo "$call_output"; } @@ -3541,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } diff --git a/agc_2-X/trunk/bin/FastAGI_log.pl b/agc_2-X/trunk/bin/FastAGI_log.pl index e6727b45..8382050b 100644 --- a/agc_2-X/trunk/bin/FastAGI_log.pl +++ b/agc_2-X/trunk/bin/FastAGI_log.pl @@ -583,6 +583,7 @@ sub process_request } ### get uniqueid and start_epoch from the call_log table + $CALLunique_id = $unique_id; $stmtA = "SELECT uniqueid,start_epoch,channel FROM call_log where uniqueid='$unique_id';"; if ($callerid =~ /^M/) {$stmtA = "SELECT uniqueid,start_epoch,channel FROM call_log where caller_code='$callerid' and channel NOT LIKE \"Local\/%\";";} @@ -616,7 +617,7 @@ sub process_request $affected_rows = $dbhA->do($stmtA); } - $stmtA = "DELETE from live_inbound where uniqueid='$unique_id' and server_ip='$VARserver_ip'"; + $stmtA = "DELETE from live_inbound where uniqueid IN('$unique_id','$CALLunique_id') and server_ip='$VARserver_ip'"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $affected_rows = $dbhA->do($stmtA); diff --git a/agc_2-X/trunk/www/agc/vdc_db_query.php b/agc_2-X/trunk/www/agc/vdc_db_query.php index 5ab415a9..07056e0a 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -236,7 +236,7 @@ $version = '2.2.0-139'; $build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=298; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2430,7 +2430,7 @@ if ($ACTION == 'manDiaLlookCaLL') $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} echo "$call_output"; } @@ -3541,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } }