From a4b3d984c116852c7cf2c7bb9714b57a66278a39 Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 5 Mar 2007 19:35:41 +0000 Subject: [PATCH] Small fix to previous fix: Fixed bug that would not record agent user id right before transfer. git-svn-id: svn://192.168.202.10@548 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/agi/agi-VDAD_LB_transfer.agi | 5 +++-- agc_2-X/trunk/agi/agi-VDAD_LO_transfer.agi | 4 ++-- agc_2-X/trunk/agi/agi-VDADtransfer.agi | 2 +- agc_2-X/trunk/agi/agi-VDADtransferSURVEY.agi | 2 +- agc_2-X/trunk/agi/agi-VDADtransferTEST.agi | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/agc_2-X/trunk/agi/agi-VDAD_LB_transfer.agi b/agc_2-X/trunk/agi/agi-VDAD_LB_transfer.agi index 127d5c5c..e1a17a4d 100644 --- a/agc_2-X/trunk/agi/agi-VDAD_LB_transfer.agi +++ b/agc_2-X/trunk/agi/agi-VDAD_LB_transfer.agi @@ -515,7 +515,7 @@ if ($rec_countWAIT < $DBconcurrent_transfers) $VDADuser=''; while ( (length($VDADuser)<1) && ($r<10) ) { - $stmtA = "SELECT conf_exten,user,extension,server_ip FROM vicidial_live_agents where status = 'QUEUE' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; + $stmtA = "SELECT conf_exten,user,extension,server_ip FROM vicidial_live_agents where status IN('QUEUE','INCALL') and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -534,7 +534,8 @@ if ($rec_countWAIT < $DBconcurrent_transfers) $r++; if ($r > 1) { - if ($AGILOG) {$agi_string = "EEEEEEEEEE vla UPDATE DELAY!!! |$callerid|$r|"; &agi_output;} + if ($AGILOG) + {$agi_string = "EEEEEEEEEE vla UPDATE DELAY!!! |$callerid|$r|"; &agi_output;} ### sleep for 23 hundredths of a second usleep(1*230*1000); diff --git a/agc_2-X/trunk/agi/agi-VDAD_LO_transfer.agi b/agc_2-X/trunk/agi/agi-VDAD_LO_transfer.agi index b3cb0b9d..a70938b1 100644 --- a/agc_2-X/trunk/agi/agi-VDAD_LO_transfer.agi +++ b/agc_2-X/trunk/agi/agi-VDAD_LO_transfer.agi @@ -516,7 +516,7 @@ if ($rec_countWAIT < $concurrent_transfers) $VDADuser=''; while ( (length($VDADuser)<1) && ($r<10) ) { - $stmtA = "SELECT conf_exten,user,extension FROM vicidial_live_agents where status = 'QUEUE' and server_ip='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; + $stmtA = "SELECT conf_exten,user,extension FROM vicidial_live_agents where status IN('QUEUE','INCALL') and server_ip='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -645,7 +645,7 @@ if ($rec_countWAITrem < $concurrent_transfers) $VDADuser=''; while ( (length($VDADuser)<1) && ($r<10) ) { - $stmtA = "SELECT conf_exten,user,extension,server_ip FROM vicidial_live_agents where status = 'QUEUE' and server_ip!='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; + $stmtA = "SELECT conf_exten,user,extension,server_ip FROM vicidial_live_agents where status IN('QUEUE','INCALL') and server_ip!='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; diff --git a/agc_2-X/trunk/agi/agi-VDADtransfer.agi b/agc_2-X/trunk/agi/agi-VDADtransfer.agi index 84cf9451..60e2b331 100644 --- a/agc_2-X/trunk/agi/agi-VDADtransfer.agi +++ b/agc_2-X/trunk/agi/agi-VDADtransfer.agi @@ -506,7 +506,7 @@ if ($rec_countWAIT < $DBconcurrent_transfers) $VDADuser=''; while ( (length($VDADuser)<1) && ($r<10) ) { - $stmtA = "SELECT conf_exten,user,extension FROM vicidial_live_agents where status = 'QUEUE' and server_ip='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; + $stmtA = "SELECT conf_exten,user,extension FROM vicidial_live_agents where status IN('QUEUE','INCALL') and server_ip='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; diff --git a/agc_2-X/trunk/agi/agi-VDADtransferSURVEY.agi b/agc_2-X/trunk/agi/agi-VDADtransferSURVEY.agi index 89a9773d..f4628dcc 100644 --- a/agc_2-X/trunk/agi/agi-VDADtransferSURVEY.agi +++ b/agc_2-X/trunk/agi/agi-VDADtransferSURVEY.agi @@ -542,7 +542,7 @@ if ($rec_countWAIT < $DBconcurrent_transfers) $VDADuser=''; while ( (length($VDADuser)<1) && ($r<10) ) { - $stmtA = "SELECT conf_exten,user,extension FROM vicidial_live_agents where status = 'QUEUE' and server_ip='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; + $stmtA = "SELECT conf_exten,user,extension FROM vicidial_live_agents where status IN('QUEUE','INCALL') and server_ip='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; diff --git a/agc_2-X/trunk/agi/agi-VDADtransferTEST.agi b/agc_2-X/trunk/agi/agi-VDADtransferTEST.agi index 59bc12bd..c7243aa8 100644 --- a/agc_2-X/trunk/agi/agi-VDADtransferTEST.agi +++ b/agc_2-X/trunk/agi/agi-VDADtransferTEST.agi @@ -507,7 +507,7 @@ if ($rec_countWAIT < $DBconcurrent_transfers) $VDADuser=''; while ( (length($VDADuser)<1) && ($r<10) ) { - $stmtA = "SELECT conf_exten,user,extension FROM vicidial_live_agents where status = 'QUEUE' and server_ip='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; + $stmtA = "SELECT conf_exten,user,extension FROM vicidial_live_agents where status IN('QUEUE','INCALL') and server_ip='$VARserver_ip' and campaign_id='$VDADcampaign' and callerid='$callerid' and channel='$channel' order by last_call_time limit 1;"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr;