diff --git a/agi/agi-VDAD_ALL_outbound.agi b/agi/agi-VDAD_ALL_outbound.agi index ecf65209..45d1a90f 100644 --- a/agi/agi-VDAD_ALL_outbound.agi +++ b/agi/agi-VDAD_ALL_outbound.agi @@ -69,6 +69,7 @@ # 90808-0307 - Added longest_wait_time as agent routing option # 90827-1535 - Added proper logging of list_id in vicidial_log table # 90924-1605 - Added drop_inbound_group_override list_id option +# 91112-1101 - Changed ENTERQUEUE to CALLOUTBOUND in QM logging for outbound calls # $script = 'agi-VDAD_ALL_outbound.agi'; @@ -680,7 +681,7 @@ if ($affected_rows > 0) if ($DBX) {print "CONNECTED TO DATABASE: $queuemetrics_server_ip|$queuemetrics_dbname\n";} - $stmtB = "INSERT INTO queue_log SET partition='P01',time_id='$now_date_epoch',call_id='$callerid',queue='$VDADcampaign',agent='NONE',verb='ENTERQUEUE',data2='$data2',serverid='$queuemetrics_log_id';"; + $stmtB = "INSERT INTO queue_log SET partition='P01',time_id='$now_date_epoch',call_id='$callerid',queue='$VDADcampaign',agent='NONE',verb='CALLOUTBOUND',data2='$data2',serverid='$queuemetrics_log_id';"; $Baffected_rows = $dbhB->do($stmtB); $dbhP=$dbhB; $stmtA=$stmtB; $mysql_count='01012'; $MEL_aff_rows=$Baffected_rows; &mysql_error_logging; $dbhB->disconnect(); diff --git a/bin/AST_cleanup_agent_log.pl b/bin/AST_cleanup_agent_log.pl index e3924365..ce54f011 100644 --- a/bin/AST_cleanup_agent_log.pl +++ b/bin/AST_cleanup_agent_log.pl @@ -18,7 +18,8 @@ # 81029-0124 - Added portion to clean up queue_log entries if QM enabled # 81114-0155 - Added portion to remove queue_log COMPLETE duplicates # 81208-0133 - Added portion to check for more missing queue_log entries -# 90330-2128 - minor code fixes and restricted queue_log actions to VICIDIAL-defined serverid records +# 90330-2128 - Minor code fixes and restricted queue_log actions to VICIDIAL-defined serverid records +# 91112-1100 - Added fixing for more QM issues, added CALLOUTBOUND checking with ENTERQUEUE # # constants @@ -260,7 +261,7 @@ if ( ($enable_queuemetrics_logging > 0) && ($login_lagged_check > 0) ) $sthB = $dbhB->prepare($stmtB) or die "preparing: ",$dbhB->errstr; $sthB->execute or die "executing: $stmtB ", $dbhB->errstr; $EQ_records=$sthB->rows; - if ($DB) {print "ENTERQUEUE Records: $EQ_records|$stmtB|\n\n";} + if ($DB) {print "AGENTLOGIN Records: $EQ_records|$stmtB|\n\n";} $h=0; while ($EQ_records > $h) { @@ -477,7 +478,7 @@ if ($enable_queuemetrics_logging > 0) ############################################################## ##### grab all queue_log entries for ENTERQUEUE verb to validate - $stmtB = "SELECT time_id,call_id,queue,agent,verb,serverid FROM queue_log where verb='ENTERQUEUE' and serverid='$queuemetrics_log_id' $QM_SQL_time order by time_id;"; + $stmtB = "SELECT time_id,call_id,queue,agent,verb,serverid FROM queue_log where verb IN('ENTERQUEUE','CALLOUTBOUND') and serverid='$queuemetrics_log_id' $QM_SQL_time order by time_id;"; $sthB = $dbhB->prepare($stmtB) or die "preparing: ",$dbhB->errstr; $sthB->execute or die "executing: $stmtB ", $dbhB->errstr; $EQ_records=$sthB->rows; diff --git a/www/agc/manager_send.php b/www/agc/manager_send.php index 03f0fd5e..6c0723fb 100644 --- a/www/agc/manager_send.php +++ b/www/agc/manager_send.php @@ -91,10 +91,11 @@ # 90913-1410 - Fixed minor logging bug # 90916-1830 - Added nodeletevdac # 90924-1555 - Added am_message_exten_override for list_id option +# 91112-1110 - Added CALLOUTBOUND value to QM entry lookup # -$version = '2.2.0-43'; -$build = '90924-1555'; +$version = '2.2.0-44'; +$build = '91112-1110'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=85; $one_mysql_log=0; @@ -645,7 +646,7 @@ $rslt=mysql_query($stmt, $link); if ($caller_complete < 1) { $time_id=0; - $stmt="SELECT time_id from queue_log where call_id='$CalLCID' and verb='ENTERQUEUE' and queue='$CLcampaign_id';"; + $stmt="SELECT time_id from queue_log where call_id='$CalLCID' and verb IN('ENTERQUEUE','CALLOUTBOUND') and queue='$CLcampaign_id';"; $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'02018',$user,$server_ip,$session_name,$one_mysql_log);} $VAC_eq_ct = mysql_num_rows($rslt); diff --git a/www/agc/vdc_db_query.php b/www/agc/vdc_db_query.php index 44dd2758..3b39706e 100644 --- a/www/agc/vdc_db_query.php +++ b/www/agc/vdc_db_query.php @@ -220,10 +220,11 @@ # 91019-1224 - Fixed auto-alt-dial DNC issues # 91026-1101 - Added AREACODE DNC option # 91108-2120 - Fixed QM log issue with PAUSEREASON entries +# 91112-1107 - Changed ENTERQUEUE to CALLOUTBOUND for QM logging # -$version = '2.2.0-129'; -$build = '91108-2120'; +$version = '2.2.0-130'; +$build = '91112-1107'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=256; $one_mysql_log=0; @@ -1766,8 +1767,8 @@ if ($ACTION == 'manDiaLnextCaLL') if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'00038',$user,$server_ip,$session_name,$one_mysql_log);} $affected_rows = mysql_affected_rows($linkB); - # ENTERQUEUE - $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='$MqueryCID',queue='$campaign',agent='NONE',verb='ENTERQUEUE',data2='$phone_number',serverid='$queuemetrics_log_id';"; + # CALLOUTBOUND (formerly ENTERQUEUE) + $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='$MqueryCID',queue='$campaign',agent='NONE',verb='CALLOUTBOUND',data2='$phone_number',serverid='$queuemetrics_log_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'00039',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2098,8 +2099,8 @@ if ($ACTION == 'manDiaLonly') if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'00049',$user,$server_ip,$session_name,$one_mysql_log);} $affected_rows = mysql_affected_rows($linkB); - # ENTERQUEUE - $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='$MqueryCID',queue='$campaign',agent='NONE',verb='ENTERQUEUE',data2='$phone_number',serverid='$queuemetrics_log_id';"; + # CALLOUTBOUND (formerly ENTERQUEUE) + $stmt = "INSERT INTO queue_log SET partition='P01',time_id='$StarTtime',call_id='$MqueryCID',queue='$campaign',agent='NONE',verb='CALLOUTBOUND',data2='$phone_number',serverid='$queuemetrics_log_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $linkB); if ($mel > 0) {mysql_error_logging($NOW_TIME,$linkB,$mel,$stmt,'00050',$user,$server_ip,$session_name,$one_mysql_log);}