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 2df5f9e4..bd71e452 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 @@ -36,6 +36,7 @@ # 90721-1315 - Added rank and owner as vicidial_list fields, stdrankowner format # 90728-1255 - Added fixed254 file format # 90802-0758 - Added sctab08 file format +# 90810-0956 - Added sccsv11 file format # $secX = time(); @@ -52,6 +53,7 @@ if ($sec < 10) {$sec = "0$sec";} if ($mon < 10) {$mon = "0$mon";} if ($mday < 10) {$mday = "0$mday";} $pulldate0 = "$year-$mon-$mday $hour:$min:$sec"; +$insert_date = "$year-$mon-$mday $hour:$min:$sec"; $inSD = $pulldate0; $dsec = ( ( ($hour * 3600) + ($min * 60) ) + $sec ); $MT[0]=''; @@ -155,9 +157,12 @@ if (length($ARGV[0])>1) print "fixed254:\n"; print "fixed width(without the quotes)\n"; print "\"9185551212ROSE SMITHS 155 TIGER MOUNTAIN RD. RR 1 BOX 107 HENRYETTA OK74437-941DEMG 226555 0 \"\n\n"; - print "sctab08:\n" + print "sctab08:\n"; print "STATE\tNAME\tPHONE\tFAX\tADDRESS\tADDRESS2\tCITY\tZIP\n"; print "AL\tTom Wilson\t205 5551212\t\t 1689 15th Ave\t\tBESSEMER\t35020\n\n"; + print "sccsv11:\n"; + print "STATE,ID,NAME,ADDRESS,ADDRESS2,CITY,COUNTY,PHONE,FAX,ZIP,COMMENTS\n"; + print "AL,16700,Fairfax Retirement Center (Crowder House),1324 25th St,,FAIRFAX,JEFFERSON,(205) 555-0508,,35733,Comments\n\n"; exit; } @@ -333,6 +338,7 @@ $dir2 = "$PATHhome/LEADS_IN/DONE"; if($DBX){print STDERR "\nLEADS_IN directory: |$dir1|\n";} + if ($ftp_pull > 0) { $i=0; @@ -608,6 +614,111 @@ foreach(@FILES) $format_set++; } + # This is the format for the sccsv11 lead files + # STATE,ID,NAME,ADDRESS,ADDRESS2,CITY,COUNTY,PHONE,FAX,ZIP,COMMENTS + # AL,16700,Fairfax Retirement Center (Crowder House),1324 25th St,,FAIRFAX,JEFFERSON,(205) 555-0508,,35733,Comments + + if ( ($format =~ /sccsv11/) && ($format_set < 1) ) + { + $raw_number =~ s/\'|\t|\r|\n|\l//gi; + $raw_number =~ s/,/\|/gi; + @m = split(/\|/, $raw_number); + @name=@MT; + $state = $m[0]; chomp($state); + $vendor_lead_code = $m[1]; $vendor_lead_code =~ s/\D//gi; + + $field = 2; + if ($m[$field] =~ /^\"/) + { + $full_name = "$m[$field]"; $field++; + $full_name .= "$m[$field]"; $field++; + } + else + { + $full_name = "$m[$field]"; $field++; + } + $full_name =~ s/\"|\)|\(|;//gi; + @name = split(/ /, $full_name); + $first_name = $name[1]; chomp($first_name); + $last_name = "$name[0] $name[2]"; chomp($first_name); + $middle_initial = ''; + + if ($m[$field] =~ /^\"/) + { + $address1 = "$m[$field]"; $field++; + $address1 .= "$m[$field]"; $field++; + } + else + { + $address1 = "$m[$field]"; $field++; + } + $address1 =~ s/\"|\)|\(|;//gi; + + if ($m[$field] =~ /^\"/) + { + $address2 = "$m[$field]"; $field++; + $address2 .= "$m[$field]"; $field++; + } + else + { + $address2 = "$m[$field]"; $field++; + } + $address2 =~ s/\"|\)|\(|;//gi; + + if ($m[$field] =~ /^\"/) + { + $city = "$m[$field]"; $field++; + $city .= "$m[$field]"; $field++; + } + else + { + $city = "$m[$field]"; $field++; + } + $city =~ s/\"|\)|\(|;//gi; + + if ($m[$field] =~ /^\"/) + { + $province = "$m[$field]"; $field++; + $province .= "$m[$field]"; $field++; + } + else + { + $province = "$m[$field]"; $field++; + } + $province =~ s/\"|\)|\(|;//gi; + + $phone_number = "$m[$field]"; $field++; $phone_number =~ s/\D//gi; + $USarea = substr($phone_number, 0, 3); + $alt_phone = "$m[$field]"; $field++; $alt_phone =~ s/\D//gi; + $postal_code = "$m[$field]"; $field++; + + if ($m[$field] =~ /^\"/) + { + $comments = "$m[$field]"; $field++; + $comments .= "$m[$field]"; $field++; + } + else + { + $comments = "$m[$field]"; $field++; + } + $comments =~ s/\"|\)|\(|;//gi; + + $source_code = ''; + $list_id = '995'; + $phone_code = '1'; + $title = ''; + $address3 = ''; + $country = 'USA'; + $gender = 'U'; + $date_of_birth = '0000-00-00'; + $email = ''; + $security_phrase = ''; + $called_count = 0; + $status = 'NEW'; + + $format_set++; + } + # This is the format for the stdrankowner lead files (standard plus rank and owner ) #3857822|31022|105|01144|1625551212|MRS|B||BURTON|249 MUNDON ROAD|MALDON|ESSEX||||CM9 6PW|UK||||||COMMENTS|COUNT|STATUS|INS-DATE|RANK|OWNER if ( ($format =~ /stdrankowner/) && ($format_set < 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 5c9c087b..424e5e36 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -580,7 +580,7 @@ xferconf_b_number VARCHAR(50), alt_number_dialing ENUM('Y','N') default 'N', scheduled_callbacks ENUM('Y','N') default 'N', lead_filter_id VARCHAR(10) default 'NONE', -drop_call_seconds TINYINT(3) unsigned default '5', +drop_call_seconds TINYINT(3) default '5', drop_action ENUM('HANGUP','MESSAGE','VOICEMAIL','IN_GROUP') default 'MESSAGE', safe_harbor_exten VARCHAR(20) default '8307', display_dialable_count ENUM('Y','N') default 'Y', @@ -1890,7 +1890,7 @@ CREATE INDEX phone_number on vicidial_closer_log (phone_number); CREATE INDEX date_user on vicidial_closer_log (call_date,user); CREATE INDEX comment_a on live_inbound_log (comment_a); -UPDATE system_settings SET db_schema_version='1167'; +UPDATE system_settings SET db_schema_version='1168'; GRANT RELOAD ON *.* TO cron@'%'; GRANT RELOAD ON *.* TO cron@localhost; diff --git a/agc_2-X/trunk/extras/upgrade_2.2.0.sql b/agc_2-X/trunk/extras/upgrade_2.2.0.sql index b1fb3919..e8550ffb 100644 --- a/agc_2-X/trunk/extras/upgrade_2.2.0.sql +++ b/agc_2-X/trunk/extras/upgrade_2.2.0.sql @@ -485,3 +485,7 @@ ALTER TABLE vicidial_campaigns MODIFY next_agent_call ENUM('random','oldest_call ALTER TABLE vicidial_inbound_groups MODIFY next_agent_call ENUM('random','oldest_call_start','oldest_call_finish','overall_user_level','inbound_group_rank','campaign_rank','fewest_calls','fewest_calls_campaign','longest_wait_time') default 'longest_wait_time'; UPDATE system_settings SET db_schema_version='1167'; + +ALTER TABLE vicidial_campaigns MODIFY drop_call_seconds TINYINT(3) default '5'; + +UPDATE system_settings SET db_schema_version='1168'; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 3914af19..f828ab4a 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -1192,7 +1192,6 @@ if ($non_latin < 1) $delete_users = ereg_replace("[^0-9]","",$delete_users); $dial_timeout = ereg_replace("[^0-9]","",$dial_timeout); $dialplan_number = ereg_replace("[^0-9]","",$dialplan_number); - $drop_call_seconds = ereg_replace("[^0-9]","",$drop_call_seconds); $enable_fast_refresh = ereg_replace("[^0-9]","",$enable_fast_refresh); $enable_persistant_mysql = ereg_replace("[^0-9]","",$enable_persistant_mysql); $fast_refresh_rate = ereg_replace("[^0-9]","",$fast_refresh_rate); @@ -1291,6 +1290,8 @@ if ($non_latin < 1) $allow_alerts = ereg_replace("[^0-9]","",$allow_alerts); $vicidial_balance_rank = ereg_replace("[^0-9]","",$vicidial_balance_rank); + $drop_call_seconds = ereg_replace("[^-0-9]","",$drop_call_seconds); + ### DIGITS and COLONS $shift_length = ereg_replace("[^\:0-9]","",$shift_length);