From 2f6e08a4e5411bf8829719514f9e289db50a9b2d Mon Sep 17 00:00:00 2001
From: mattf <mattf@3d104415-ff17-0410-8863-d5cf3c621b8a>
Date: Fri, 4 Aug 2006 16:42:55 +0000
Subject: [PATCH] fixed bug in AST_VDhopper.pl that would insert USERONLY
 callbacks into the vicidial_hopper and change their status to CALLBK from
 CBHOLD allowing them to be called by the system instead of just by the agent.

git-svn-id: svn://192.168.202.10@113 3d104415-ff17-0410-8863-d5cf3c621b8a
---
 agc_2-X/trunk/agi/agi-VDAD_pin_IVR.agi |  4 ++--
 agc_2-X/trunk/bin/AST_VDhopper.pl      | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/agc_2-X/trunk/agi/agi-VDAD_pin_IVR.agi b/agc_2-X/trunk/agi/agi-VDAD_pin_IVR.agi
index 4fe8fed7..d91c4dae 100644
--- a/agc_2-X/trunk/agi/agi-VDAD_pin_IVR.agi
+++ b/agc_2-X/trunk/agi/agi-VDAD_pin_IVR.agi
@@ -164,7 +164,7 @@ while(<STDIN>) {
 
 	if (/^agi_extension\:\s+(.*)$/)		{$extension = $1;}
 	### allow for internal transfer data string "83009*3125551212*10000123*TESTCAMP*ABC*1234*"
-	if ($extension =~ /^8300\d\*/)
+	if ($extension =~ /^8320\d\*/)
 		{
 		@EXT_vars = split(/\*/, $extension);
 		
@@ -177,7 +177,7 @@ while(<STDIN>) {
 		}
 }
 
-	if ($V) {print STDERR "\nINBOUND DTMF CALL VDCL STARTED\n";}
+	if ($V) {print STDERR "\nINBOUND IVR PLAY CALL VDCL STARTED\n";}
 
 
 $AGI->stream_file('beep');
diff --git a/agc_2-X/trunk/bin/AST_VDhopper.pl b/agc_2-X/trunk/bin/AST_VDhopper.pl
index 7d3cc06b..0b2780f0 100644
--- a/agc_2-X/trunk/bin/AST_VDhopper.pl
+++ b/agc_2-X/trunk/bin/AST_VDhopper.pl
@@ -259,7 +259,7 @@ if ($CBHOLD_count > 0)
 	$update_leads='';
 	$cbc=0;
 	$cba=0;
-	$stmtA = "SELECT vicidial_callbacks.lead_id,recipient,campaign_id,vicidial_callbacks.list_id,gmt_offset_now FROM vicidial_callbacks,vicidial_list where callback_time <= '$now_date' and vicidial_callbacks.status='ACTIVE' and vicidial_callbacks.lead_id=vicidial_list.lead_id;";
+	$stmtA = "SELECT vicidial_callbacks.lead_id,recipient,campaign_id,vicidial_callbacks.list_id,gmt_offset_now,state FROM vicidial_callbacks,vicidial_list where callback_time <= '$now_date' and vicidial_callbacks.status='ACTIVE' and vicidial_callbacks.lead_id=vicidial_list.lead_id;";
 	$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 	$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 	$sthArows=$sthA->rows;
@@ -269,12 +269,13 @@ if ($CBHOLD_count > 0)
 		$lead_ids[$cbc] = $aryA[0];
 		$recipient = $aryA[1];
 		$update_leads .= "'$lead_ids[$cbc]',";
-		if ($recipient == 'ANYONE')
+		if ($recipient =~ /ANYONE/)
 			{
 			$CA_lead_id[$cba] = $aryA[0];
 			$CA_campaign_id[$cba] = $aryA[2];
 			$CA_list_id[$cba] = $aryA[3];
 			$CA_gmt_offset_now[$cba] = $aryA[4];
+			$CA_state[$cba] = $aryA[5];
 			$cba++;
 			}
 		$cbc++;
@@ -284,12 +285,6 @@ if ($CBHOLD_count > 0)
 		{
 		chop($update_leads);
 
-		$stmtA = "UPDATE vicidial_list set status='CALLBK', called_since_last_reset='N' where lead_id IN($update_leads);";
-		$affected_rows = $dbhA->do($stmtA);
-		if ($DB) {print "Scheduled Callbacks Activated:  $affected_rows\n";}
-			$event_string = "|CALLBACKS LISTACT|$affected_rows|";
-			&event_logger;
-
 		$stmtA = "UPDATE vicidial_callbacks set status='LIVE' where lead_id IN($update_leads) and status NOT IN('INACTIVE','DEAD','ARCHIVE');";
 		$affected_rows = $dbhA->do($stmtA);
 		if ($DB) {print "Scheduled Callbacks Activated:  $affected_rows\n";}
@@ -306,7 +301,13 @@ if ($CBHOLD_count > 0)
 		$CAu=0;
 		foreach(@CA_lead_id)
 			{
-			$stmtA = "INSERT INTO $vicidial_hopper SET lead_id='$CA_lead_id[$CAu]',campaign_id='$CA_campaign_id[$CAu]',list_id='$CA_list_id[$CAu]',gmt_offset_now='$CA_gmt_offset_now[$CAu]';";
+			$stmtA = "UPDATE vicidial_list set status='CALLBK', called_since_last_reset='N' where lead_id='$CA_lead_id[$CAu]';";
+			$affected_rows = $dbhA->do($stmtA);
+			if ($DB) {print "Scheduled Callbacks Activated:  $affected_rows\n";}
+				$event_string = "|CALLBACKS LISTACT|$affected_rows|";
+				&event_logger;
+
+			$stmtA = "INSERT INTO $vicidial_hopper SET lead_id='$CA_lead_id[$CAu]',campaign_id='$CA_campaign_id[$CAu]',list_id='$CA_list_id[$CAu]',gmt_offset_now='$CA_gmt_offset_now[$CAu]',user='',state='$CA_state[$CAu]';";
 			$affected_rows = $dbhA->do($stmtA);
 			if ($DB) {print "ANYONE Scheduled Callback Inserted into hopper:  $affected_rows|$CA_lead_id[$CAu]\n";}
 			$CAu++;