From 2ffe103858f62d8b119dee7fa6e295179d27c64e Mon Sep 17 00:00:00 2001 From: mattf Date: Thu, 13 May 2010 19:39:34 +0000 Subject: [PATCH] small fixes for inbound PRESS changes added csvdcref51 CLI lead loader format git-svn-id: svn://192.168.202.10@1434 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi | 22 ++++++++++--- .../trunk/bin/VICIDIAL_IN_new_leads_file.pl | 31 ++++++++++--------- .../trunk/extras/MySQL_AST_CREATE_tables.sql | 4 +-- agc_2-X/trunk/extras/upgrade_2.4.sql | 7 +++++ 4 files changed, 43 insertions(+), 21 deletions(-) diff --git a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi index 46c105a0..35967312 100644 --- a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi +++ b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi @@ -3235,6 +3235,8 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) ) exit; } } + $start_moh=1; + $moh_delay=1; } } @@ -3615,11 +3617,23 @@ sub press_one_hold_time_option_prompt undef $interrupt_digit; $digit_loop_counter=0; - $interrupt_digit = $AGI->stream_file("$hold_time_option_press_filename",'1'); - if ($interrupt_digit < 2) - {$interrupt_digit = $AGI->stream_file('digits/1','1');} + if ($hold_time_option_press_filename =~ /\|/) + { + @hold_time_option_press_filename_array = split(/\|/,$hold_time_option_press_filename); + $w=0; + foreach(@hold_time_option_press_filename_array) + { + if ( (length($hold_time_option_press_filename_array[$w])>0) && ($interrupt_digit < 2) ) + { + $interrupt_digit = $AGI->stream_file("$hold_time_option_press_filename_array[$w]",'1'); + } + $w++; + } + } + else + {$interrupt_digit = $AGI->stream_file("$hold_time_option_press_filename",'1');} # this prompt must be less than 10 seconds long - if ($AGILOG) {$agi_string = "interrupt_digit |$interrupt_digit|"; &agi_output;} + if ($AGILOG) {$agi_string = "interrupt_digit |$interrupt_digit|"; &agi_output;} $digits_being_entered=1; $totalDTMF=''; diff --git a/agc_2-X/trunk/bin/VICIDIAL_IN_new_leads_file.pl b/agc_2-X/trunk/bin/VICIDIAL_IN_new_leads_file.pl index 6b3bcf7c..94fd296f 100644 --- a/agc_2-X/trunk/bin/VICIDIAL_IN_new_leads_file.pl +++ b/agc_2-X/trunk/bin/VICIDIAL_IN_new_leads_file.pl @@ -192,7 +192,7 @@ if (length($ARGV[0])>1) print "dccsv10:\n"; print "VENDOR_ID,FIRST_NAME,LAST_NAME,PHONE_1,PHONE_2,PHONE_3,PHONE_4,PHONE_5,PHONE_6,PHONE_7\n"; print "\"100998\",\"ANGELA \",\"SMITH \",\"3145551212\",\"3145551213\",\"3145551214\",\"0\",\"3145551215\",\"3145551216\",\"0\",\n\n"; - print "dccsv43 and dccsvref43:\n"; + print "dccsv43 and dccsvref51:\n"; print "---format too confusing to list in the help screen---\n\n"; exit; @@ -1026,6 +1026,7 @@ foreach(@FILES) $number =~ s/\",\"/\|/gi; $number =~ s/\"//gi; $number =~ s/\|0000000000//gi; + $number =~ s/ //gi; @m=@MT; @m = split(/\|/, $number); if ($DBX) {print "RAW: $#m-----$number\n";} @@ -1070,32 +1071,32 @@ foreach(@FILES) $r=0; $map_count=0; - if (length($m[38]) > 9) + if ( (length($m[38]) > 9) && ($m[38] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[38]; $ALTm_phone_code[$r] = '1'; $r++; $map_count++; $g++; } - if (length($m[39]) > 9) + if ( (length($m[39]) > 9) && ($m[39] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[39]; $ALTm_phone_code[$r] = '1'; $r++; $map_count++; } - if (length($m[40]) > 9) + if ( (length($m[40]) > 9) && ($m[40] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[40]; $ALTm_phone_code[$r] = '1'; $r++; $map_count++; } - if (length($m[41]) > 9) + if ( (length($m[41]) > 9) && ($m[41] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[41]; $ALTm_phone_code[$r] = '1'; $r++; $map_count++; } - if (length($m[42]) > 9) + if ( (length($m[42]) > 9) && ($m[42] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[42]; $ALTm_phone_code[$r] = '1'; @@ -1118,11 +1119,11 @@ foreach(@FILES) $format_set++; } - # This is the format for the dccsvref43 lead files + # This is the format for the dccsvref51 lead files #"BF_ID","RECORD_TYPE","LAST_NAME","FIRST_NAME","4ADDR1","5ADDR2","6CITY","STATE","ZIP","9ZIP4","ADDR_STATUS","DATE_PLACED","DATE_ADDED","DOB","LAST_LETTER","LAST_LETTER_DATE","LAST_WORKED","NEXT_ACTION_DATE","CAPTURE_CODE","CUR_CATEGORY","TIMES_DIALED","LAST_DIALED","TOTAL_PAID","DATE_LAST_PAID","NMBR_CALLS","NMBR_CONTACTS","NMBR_TIMES_WRKD","NMBR_LETTERS","STATUS_CODE","STATUS_DATE","SCORE","TIMES_TO_SERVICER","1ST-PMT-DEFAULT","TIME_ZONE","ORIG_CREDITOR","BALANCE","HOME_PHONE","WORK_PHONE","OTHER_PHONE","ACCT_OTHTEL2","ACCT_OTHTEL3","ACCT_OTHTEL4","ACCT_OTHTEL5" #"II ACCT/1103566666 ","P","SMITH "," SAMMY","7838 W 109TH ST APT 12 "," ","OVERLAND PARK ","KS","66212","0000","G","20091110","20091110","19661216","NOLTTR","00000000","20091214","20091219","1000","03","000","00000000","000000000.00 ","00000000","0004","0003","0004","000","ACTIVE","20091110","0648","00"," ","C","HSBC ","000000692.09 ","9135551212","0000000000","0000000000","0000000000","0000000000","0000000000","0000000000" - if ( ($format =~ /dccsvref43/) && ($format_set < 1) ) + if ( ($format =~ /dccsvref51/) && ($format_set < 1) ) { $raw_number = $number; chomp($number); @@ -1137,7 +1138,7 @@ foreach(@FILES) $number =~ s/\",,\"/\|\|/gi; $number =~ s/\",\"/\|/gi; $number =~ s/\"//gi; - $number =~ s/\|0000000000//gi; + # $number =~ s/\|0000000000//gi; @m=@MT; @m = split(/\|/, $number); if ($DBX) {print "RAW: $#m-----$number\n";} @@ -1172,7 +1173,7 @@ foreach(@FILES) $alt_phone = $m[37]; chomp($alt_phone); $alt_phone =~ s/\D//gi; $email = $m[11]; # date placed $security_phrase = ''; # looked-up geographic CID will go here - $comments = "$m[16]|$m[21]"; # last worked/dialed + $comments = $m[43]; # ref-name $called_count = '0'; $status = 'NEW'; $insert_date = $pulldate0; @@ -1182,32 +1183,32 @@ foreach(@FILES) $r=0; $map_count=0; - if (length($m[38]) > 9) + if ( (length($m[38]) > 9) && ($m[38] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[38]; $ALTm_phone_code[$r] = '1'; $r++; $map_count++; $g++; } - if (length($m[39]) > 9) + if ( (length($m[39]) > 9) && ($m[39] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[39]; $ALTm_phone_code[$r] = '1'; $r++; $map_count++; } - if (length($m[40]) > 9) + if ( (length($m[40]) > 9) && ($m[40] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[40]; $ALTm_phone_code[$r] = '1'; $r++; $map_count++; } - if (length($m[41]) > 9) + if ( (length($m[41]) > 9) && ($m[41] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[41]; $ALTm_phone_code[$r] = '1'; $r++; $map_count++; } - if (length($m[42]) > 9) + if ( (length($m[42]) > 9) && ($m[42] !~ /000000000/) ) { $ALTm_phone_number[$r] = $m[42]; $ALTm_phone_code[$r] = '1'; diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index 0d048d65..b1736c83 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -901,7 +901,7 @@ extension_appended_cidname ENUM('Y','N') default 'N', uniqueid_status_display ENUM('DISABLED','ENABLED','ENABLED_PREFIX','ENABLED_PRESERVE') default 'DISABLED', uniqueid_status_prefix VARCHAR(50) default '', hold_time_option_minimum SMALLINT(5) default '0', -hold_time_option_press_filename VARCHAR(255) default 'to-be-called-back', +hold_time_option_press_filename VARCHAR(255) default 'to-be-called-back|digits/1', hold_time_option_callmenu VARCHAR(50) default '' ); @@ -2232,7 +2232,7 @@ ALTER TABLE vicidial_agent_log_archive MODIFY agent_log_id INT(9) UNSIGNED NOT N CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log; -UPDATE system_settings SET db_schema_version='1221',db_schema_update_date=NOW(); +UPDATE system_settings SET db_schema_version='1222',db_schema_update_date=NOW(); GRANT RELOAD ON *.* TO cron@'%'; GRANT RELOAD ON *.* TO cron@localhost; diff --git a/agc_2-X/trunk/extras/upgrade_2.4.sql b/agc_2-X/trunk/extras/upgrade_2.4.sql index 8d828506..bf92b648 100644 --- a/agc_2-X/trunk/extras/upgrade_2.4.sql +++ b/agc_2-X/trunk/extras/upgrade_2.4.sql @@ -323,3 +323,10 @@ ALTER TABLE vicidial_inbound_groups ADD hold_time_option_press_filename VARCHAR( ALTER TABLE vicidial_inbound_groups ADD hold_time_option_callmenu VARCHAR(50) default ''; UPDATE system_settings SET db_schema_version='1221',db_schema_update_date=NOW(); + +ALTER TABLE vicidial_inbound_groups MODIFY hold_time_option_press_filename VARCHAR(255) default 'to-be-called-back|digits/1'; + +UPDATE vicidial_inbound_groups SET hold_time_option_press_filename='to-be-called-back|digits/1' where hold_time_option_press_filename='to-be-called-back'; + +UPDATE system_settings SET db_schema_version='1222',db_schema_update_date=NOW(); +