From 3161c3842e24c54c31c034a5493d52ebb5799b83 Mon Sep 17 00:00:00 2001 From: mattf Date: Fri, 4 Aug 2006 16:42:45 +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@112 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_1-X/trunk/AST_VDhopper.pl | 21 +++++++++++---------- agc_1-X/trunk/DBI-scripts/AST_VDhopper.pl | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/agc_1-X/trunk/AST_VDhopper.pl b/agc_1-X/trunk/AST_VDhopper.pl index 467e238d..5e2eea98 100644 --- a/agc_1-X/trunk/AST_VDhopper.pl +++ b/agc_1-X/trunk/AST_VDhopper.pl @@ -235,7 +235,7 @@ if ($dbhA->has_selected_record) if ($CBHOLD_count > 0) { $update_leads=''; - $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;"; $dbhA->query("$stmtA"); if ($dbhA->has_selected_record) { @@ -247,12 +247,13 @@ if ($CBHOLD_count > 0) $lead_ids[$cbc] = $record->[0]; $recipient = $record->[1]; $update_leads .= "'$lead_ids[$cbc]',"; - if ($recipient == 'ANYONE') + if ($recipient =~ /ANYONE/) { $CA_lead_id[$cba] = $record->[0]; $CA_campaign_id[$cba] = $record->[2]; $CA_list_id[$cba] = $record->[3]; $CA_gmt_offset_now[$cba] = $record->[4]; + $CA_state[$cba] = $record->[5]; $cba++; } $cbc++; @@ -262,13 +263,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);"; - $dbhA->query("$stmtA"); - my $affected_rows = $dbhA->get_affected_rows_length; - 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');"; $dbhA->query("$stmtA"); my $affected_rows = $dbhA->get_affected_rows_length; @@ -286,7 +280,14 @@ 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]';"; + $dbhA->query("$stmtA"); + my $affected_rows = $dbhA->get_affected_rows_length; + 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]';"; $dbhA->query("$stmtA"); $CAu++; } diff --git a/agc_1-X/trunk/DBI-scripts/AST_VDhopper.pl b/agc_1-X/trunk/DBI-scripts/AST_VDhopper.pl index 6188d771..33d7fe0e 100644 --- a/agc_1-X/trunk/DBI-scripts/AST_VDhopper.pl +++ b/agc_1-X/trunk/DBI-scripts/AST_VDhopper.pl @@ -219,7 +219,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; @@ -229,12 +229,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++; @@ -244,13 +245,7 @@ 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');;"; + $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";} $event_string = "|CALLBACKS CB ACT |$affected_rows|"; @@ -266,7 +261,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++;