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 0d9d6035..11694830 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
@@ -54,9 +54,10 @@
# 110705-1913 - Added options for USACAN prefix(no 0 or 1) and valid areacode filtering
# 110929-1423 - Added new format for abbreviated timezone in owner(pipe30tz) and list creation options
# 120713-1009 - Added new --duplicate-tnm-delete option to check for a duplicate phone with different title and delete existing if found in same list
+# 120907-1109 - Added vote17csv format
#
-$version = '120713-1009';
+$version = '120907-1109';
$secX = time();
$MT[0]='';
@@ -212,6 +213,9 @@ if (length($ARGV[0])>1)
print "\"100998\",\"ANGELA \",\"SMITH \",\"3145551212\",\"3145551213\",\"3145551214\",\"0\",\"3145551215\",\"3145551216\",\"0\",\n\n";
print "pipe30tz:\n";
print "TEST01||09292011|1|5125554727||Mike||Frank|||||||||||||||||C|2145559922|TESTSURVEY|TESTSURVEY|111\n";
+ print "vote17csv:\n";
+ print "Voter ID,County Code,Name Last,Gender,Race,Birth Date,Party Affiliation,Precinct,Congressional District,House District,Senate District,County Commission District,School Board District,Age Bracket,_2010_GEN,_2012_PRI_A_Date,Phone_10digit\n";
+ print "\"110306742\",\"DAD\",\"Da Silva Ramos\",\"F\",\"5\",\"06/12/1950\",\"DEM\",\"100\",\"23\",\"0\",\"0\",\"0\",\"0\",\"4\",\"A\",\"\",\"0033559433\"\n\n";
print "dccsv43, dccsvref51, dccsv52 and dccsvref52:\n";
print "---format too confusing to list in the help screen---\n\n";
@@ -792,6 +796,45 @@ foreach(@FILES)
$format_set++;
}
+ # This is the format for the vote17csv lead files
+ # Voter ID,County Code,Name Last,Gender,Race,Birth Date,Party Affiliation,Precinct,Congressional District,House District,Senate District,County Commission District,School Board District,Age Bracket,_2010_GEN,_2012_PRI_A_Date,Phone_10digit
+ # "110555742","DAD","Bob Smith","F","5","06/14/1970","DEM","100","23","0","0","0","0","4","A","","8135559433"
+ if ( ($format =~ /vote17csv/) && ($format_set < 1) )
+ {
+ @name=@MT;
+ $vendor_lead_code = '';
+ $source_id = $m[0]; # voter ID number
+ $list_id = '995';
+ $phone_code = '1';
+ $phone_number = $m[16]; chomp($phone_number); $phone_number =~ s/\D//gi;
+ $USarea = substr($phone_number, 0, 3);
+ $title = $m[6]; # political party
+ $first_name = '';
+ $last_name = $m[2]; chomp($first_name);
+
+ $middle_initial = '';
+ $address1 = $m[9]; # state House district
+ $address2 = $m[10]; # state Senate district
+ $address3 = $m[1]; # county
+ $city = '';
+ $state = $m[4]; # race/ethnicity
+ $province = $m[7]; # precinct
+ $postal_code = '';
+ $country = 'USA';
+ $gender = $m[3];
+ $date_of_birth = $m[5];
+ $alt_phone = $m[12]; # school district
+ $email = $m[11]; # county commission district
+ $security_phrase = ''; # first survey question response
+ $comments = '';
+ $rank = '0';
+ $owner = $m[8]; # US Congress district
+ $called_count = 0;
+ $status = 'NEW';
+
+ $format_set++;
+ }
+
# This is the format for the fixed254 lead files
#"9185551212ROSE SMITHS 155 TIGER MOUNTAIN RD. RR 1 BOX 107 HENRYETTA OK74437-941DEMG 226555 0 "
if ( ($format =~ /fixed254/) && ($format_set < 1) )
diff --git a/agc_2-X/trunk/docs/Extended_VL_fields.txt b/agc_2-X/trunk/docs/Extended_VL_fields.txt
index 391a59e5..11dec7bf 100644
--- a/agc_2-X/trunk/docs/Extended_VL_fields.txt
+++ b/agc_2-X/trunk/docs/Extended_VL_fields.txt
@@ -1,11 +1,11 @@
-Extended vicidial_list fields 2012-07-13
+Extended vicidial_list fields 2012-09-07
These fields were added to allow for more complex Call Menu setups with an
-additional 20 TINYINT fields allowed for DTMF Log data storage.
+additional 99 TINYINT fields allowed for DTMF Log data storage.
To enable this feature, you must make the database changes shown at the bottom,
-and the options.php file needs to have $extended_vl_fields set to '1'.
+and the vicidial/options.php file needs to have $extended_vl_fields set to '1'.
@@ -31,5 +31,83 @@ ADD q16 TINYINT(1) default '-1',
ADD q17 TINYINT(1) default '-1',
ADD q18 TINYINT(1) default '-1',
ADD q19 TINYINT(1) default '-1',
-ADD q20 TINYINT(1) default '-1';
-
+ADD q20 TINYINT(1) default '-1',
+ADD q21 TINYINT(1) default '-1',
+ADD q22 TINYINT(1) default '-1',
+ADD q23 TINYINT(1) default '-1',
+ADD q24 TINYINT(1) default '-1',
+ADD q25 TINYINT(1) default '-1',
+ADD q26 TINYINT(1) default '-1',
+ADD q27 TINYINT(1) default '-1',
+ADD q28 TINYINT(1) default '-1',
+ADD q29 TINYINT(1) default '-1',
+ADD q30 TINYINT(1) default '-1',
+ADD q31 TINYINT(1) default '-1',
+ADD q32 TINYINT(1) default '-1',
+ADD q33 TINYINT(1) default '-1',
+ADD q34 TINYINT(1) default '-1',
+ADD q35 TINYINT(1) default '-1',
+ADD q36 TINYINT(1) default '-1',
+ADD q37 TINYINT(1) default '-1',
+ADD q38 TINYINT(1) default '-1',
+ADD q39 TINYINT(1) default '-1',
+ADD q40 TINYINT(1) default '-1',
+ADD q41 TINYINT(1) default '-1',
+ADD q42 TINYINT(1) default '-1',
+ADD q43 TINYINT(1) default '-1',
+ADD q44 TINYINT(1) default '-1',
+ADD q45 TINYINT(1) default '-1',
+ADD q46 TINYINT(1) default '-1',
+ADD q47 TINYINT(1) default '-1',
+ADD q48 TINYINT(1) default '-1',
+ADD q49 TINYINT(1) default '-1',
+ADD q50 TINYINT(1) default '-1',
+ADD q51 TINYINT(1) default '-1',
+ADD q52 TINYINT(1) default '-1',
+ADD q53 TINYINT(1) default '-1',
+ADD q54 TINYINT(1) default '-1',
+ADD q55 TINYINT(1) default '-1',
+ADD q56 TINYINT(1) default '-1',
+ADD q57 TINYINT(1) default '-1',
+ADD q58 TINYINT(1) default '-1',
+ADD q59 TINYINT(1) default '-1',
+ADD q60 TINYINT(1) default '-1',
+ADD q61 TINYINT(1) default '-1',
+ADD q62 TINYINT(1) default '-1',
+ADD q63 TINYINT(1) default '-1',
+ADD q64 TINYINT(1) default '-1',
+ADD q65 TINYINT(1) default '-1',
+ADD q66 TINYINT(1) default '-1',
+ADD q67 TINYINT(1) default '-1',
+ADD q68 TINYINT(1) default '-1',
+ADD q69 TINYINT(1) default '-1',
+ADD q70 TINYINT(1) default '-1',
+ADD q71 TINYINT(1) default '-1',
+ADD q72 TINYINT(1) default '-1',
+ADD q73 TINYINT(1) default '-1',
+ADD q74 TINYINT(1) default '-1',
+ADD q75 TINYINT(1) default '-1',
+ADD q76 TINYINT(1) default '-1',
+ADD q77 TINYINT(1) default '-1',
+ADD q78 TINYINT(1) default '-1',
+ADD q79 TINYINT(1) default '-1',
+ADD q80 TINYINT(1) default '-1',
+ADD q81 TINYINT(1) default '-1',
+ADD q82 TINYINT(1) default '-1',
+ADD q83 TINYINT(1) default '-1',
+ADD q84 TINYINT(1) default '-1',
+ADD q85 TINYINT(1) default '-1',
+ADD q86 TINYINT(1) default '-1',
+ADD q87 TINYINT(1) default '-1',
+ADD q88 TINYINT(1) default '-1',
+ADD q89 TINYINT(1) default '-1',
+ADD q90 TINYINT(1) default '-1',
+ADD q91 TINYINT(1) default '-1',
+ADD q92 TINYINT(1) default '-1',
+ADD q93 TINYINT(1) default '-1',
+ADD q94 TINYINT(1) default '-1',
+ADD q95 TINYINT(1) default '-1',
+ADD q96 TINYINT(1) default '-1',
+ADD q97 TINYINT(1) default '-1',
+ADD q98 TINYINT(1) default '-1',
+ADD q99 TINYINT(1) default '-1';
diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php
index 898bd206..57d414d9 100644
--- a/agc_2-X/trunk/www/vicidial/admin.php
+++ b/agc_2-X/trunk/www/vicidial/admin.php
@@ -26745,7 +26745,7 @@ if ($ADD==3511)
$extended_vl_fields_OPTIONS='';
if ($extended_vl_fields > 0)
{
- $extended_vl_fields_OPTIONS = '';
+ $extended_vl_fields_OPTIONS = '';
}
echo "$NWB#vicidial_call_menu-dtmf_log$NWE Log Field: \n";
diff --git a/agc_2-X/trunk/www/vicidial/admin_lists_custom.php b/agc_2-X/trunk/www/vicidial/admin_lists_custom.php
index 48fd4fd7..dc2705c8 100644
--- a/agc_2-X/trunk/www/vicidial/admin_lists_custom.php
+++ b/agc_2-X/trunk/www/vicidial/admin_lists_custom.php
@@ -23,10 +23,11 @@
# 120122-1349 - Force vicidial_list custom field labels to be all lower case
# 120223-2315 - Removed logging of good login passwords if webroot writable is enabled
# 120713-2101 - Added extended_vl_fields option
+# 120907-1209 - Raised extended fields up to 99
#
-$admin_version = '2.4-17';
-$build = '120713-2101';
+$admin_version = '2.4-18';
+$build = '120907-1209';
require("dbconnect.php");
@@ -161,7 +162,7 @@ $vicidial_list_fields = '|lead_id|vendor_lead_code|source_id|list_id|gmt_offset_
if ($extended_vl_fields > 0)
{
- $vicidial_list_fields = '|lead_id|vendor_lead_code|source_id|list_id|gmt_offset_now|called_since_last_reset|phone_code|phone_number|title|first_name|middle_initial|last_name|address1|address2|address3|city|state|province|postal_code|country_code|gender|date_of_birth|alt_phone|email|security_phrase|comments|called_count|last_local_call_time|rank|owner|status|entry_date|entry_list_id|modify_date|user|q01|q02|q03|q04|q05|q06|q07|q08|q09|q10|q11|q12|q13|q14|q15|q16|q17|q18|q19|q20|';
+ $vicidial_list_fields = '|lead_id|vendor_lead_code|source_id|list_id|gmt_offset_now|called_since_last_reset|phone_code|phone_number|title|first_name|middle_initial|last_name|address1|address2|address3|city|state|province|postal_code|country_code|gender|date_of_birth|alt_phone|email|security_phrase|comments|called_count|last_local_call_time|rank|owner|status|entry_date|entry_list_id|modify_date|user|q01|q02|q03|q04|q05|q06|q07|q08|q09|q10|q11|q12|q13|q14|q15|q16|q17|q18|q19|q20|q21|q22|q23|q24|q25|q26|q27|q28|q29|q30|q31|q32|q33|q34|q35|q36|q37|q38|q39|q40|q41|q42|q43|q44|q45|q46|q47|q48|q49|q50|q51|q52|q53|q54|q55|q56|q57|q58|q59|q60|q61|q62|q63|q64|q65|q66|q67|q68|q69|q70|q71|q72|q73|q74|q75|q76|q77|q78|q79|q80|q81|q82|q83|q84|q85|q86|q87|q88|q89|q90|q91|q92|q93|q94|q95|q96|q97|q98|q99|';
}
$mysql_reserved_words =
diff --git a/agc_2-X/trunk/www/vicidial/list_download.php b/agc_2-X/trunk/www/vicidial/list_download.php
index c6be93f3..46b0bb1b 100644
--- a/agc_2-X/trunk/www/vicidial/list_download.php
+++ b/agc_2-X/trunk/www/vicidial/list_download.php
@@ -21,6 +21,7 @@
# 100929-1919 - Fixed ALL-LISTS download option to include custom fields
# 101004-2108 - Added generic custom column headers for custom fields
# 120713-2110 - Added extended_vl_fields option
+# 120907-1217 - Raised extended fields up to 99
#
require("dbconnect.php");
@@ -119,8 +120,8 @@ $extended_vl_fields_SQL='';
$extended_vl_fields_HEADER='';
if ($extended_vl_fields > 0)
{
- $extended_vl_fields_SQL = ',q01,q02,q03,q04,q05,q06,q07,q08,q09,q10,q11,q12,q13,q14,q15,q16,q17,q18,q19,q20';
- $extended_vl_fields_HEADER = "\tq01\tq02\tq03\tq04\tq05\tq06\tq07\tq08\tq09\tq10\tq11\tq12\tq13\tq14\tq15\tq16\tq17\tq18\tq19\tq20";
+ $extended_vl_fields_SQL = ',q01,q02,q03,q04,q05,q06,q07,q08,q09,q10,q11,q12,q13,q14,q15,q16,q17,q18,q19,q20,q21,q22,q23,q24,q25,q26,q27,q28,q29,q30,q31,q32,q33,q34,q35,q36,q37,q38,q39,q40,q41,q42,q43,q44,q45,q46,q47,q48,q49,q50,q51,q52,q53,q54,q55,q56,q57,q58,q59,q60,q61,q62,q63,q64,q65,q66,q67,q68,q69,q70,q71,q72,q73,q74,q75,q76,q77,q78,q79,q80,q81,q82,q83,q84,q85,q86,q87,q88,q89,q90,q91,q92,q93,q94,q95,q96,q97,q98,q99';
+ $extended_vl_fields_HEADER = "\tq01\tq02\tq03\tq04\tq05\tq06\tq07\tq08\tq09\tq10\tq11\tq12\tq13\tq14\tq15\tq16\tq17\tq18\tq19\tq20\tq21\tq22\tq23\tq24\tq25\tq26\tq27\tq28\tq29\tq30\tq31\tq32\tq33\tq34\tq35\tq36\tq37\tq38\tq39\tq40\tq41\tq42\tq43\tq44\tq45\tq46\tq47\tq48\tq49\tq50\tq51\tq52\tq53\tq54\tq55\tq56\tq57\tq58\tq59\tq60\tq61\tq62\tq63\tq64\tq65\tq66\tq67\tq68\tq69\tq70\tq71\tq72\tq73\tq74\tq75\tq76\tq77\tq78\tq79\tq80\tq81\tq82\tq83\tq84\tq85\tq86\tq87\tq88\tq89\tq90\tq91\tq92\tq93\tq94\tq95\tq96\tq97\tq98\tq99";
}
$LOGallowed_campaignsSQL='';
@@ -358,7 +359,7 @@ while ($i < $leads_to_print)
if ($list_id=='ALL-LISTS')
{
if ($extended_vl_fields > 0)
- {$extended_vl_fields_DATA = "\t$row[33]\t$row[34]\t$row[35]\t$row[36]\t$row[37]\t$row[38]\t$row[39]\t$row[40]\t$row[41]\t$row[42]\t$row[43]\t$row[44]\t$row[45]\t$row[46]\t$row[47]\t$row[48]\t$row[49]\t$row[50]\t$row[51]\t$row[52]";}
+ {$extended_vl_fields_DATA = "\t$row[33]\t$row[34]\t$row[35]\t$row[36]\t$row[37]\t$row[38]\t$row[39]\t$row[40]\t$row[41]\t$row[42]\t$row[43]\t$row[44]\t$row[45]\t$row[46]\t$row[47]\t$row[48]\t$row[49]\t$row[50]\t$row[51]\t$row[52]\t$row[53]\t$row[54]\t$row[55]\t$row[56]\t$row[57]\t$row[58]\t$row[59]\t$row[60]\t$row[61]\t$row[62]\t$row[63]\t$row[64]\t$row[65]\t$row[66]\t$row[67]\t$row[68]\t$row[69]\t$row[70]\t$row[71]\t$row[72]\t$row[73]\t$row[74]\t$row[75]\t$row[76]\t$row[77]\t$row[78]\t$row[79]\t$row[80]\t$row[81]\t$row[82]\t$row[83]\t$row[84]\t$row[85]\t$row[86]\t$row[87]\t$row[88]\t$row[89]\t$row[90]\t$row[91]\t$row[92]\t$row[93]\t$row[94]\t$row[95]\t$row[96]\t$row[97]\t$row[98]\t$row[99]\t$row[100]\t$row[101]\t$row[102]\t$row[103]\t$row[104]\t$row[105]\t$row[106]\t$row[107]\t$row[108]\t$row[109]\t$row[110]\t$row[111]\t$row[112]\t$row[113]\t$row[114]\t$row[115]\t$row[116]\t$row[117]\t$row[118]\t$row[119]\t$row[120]\t$row[121]\t$row[122]\t$row[123]\t$row[124]\t$row[125]\t$row[126]\t$row[127]\t$row[128]\t$row[129]\t$row[130]\t$row[131]";}
$row_data[$i] .= "$row[0]\t$row[1]\t$row[2]\t$row[3]\t$row[4]\t$row[5]\t$row[6]\t$row[7]\t$row[8]\t$row[9]\t$row[10]\t$row[11]\t$row[12]\t$row[13]\t$row[14]\t$row[15]\t$row[16]\t$row[17]\t$row[18]\t$row[19]\t$row[20]\t$row[21]\t$row[22]\t$row[23]\t$row[24]\t$row[25]\t$row[26]\t$row[27]\t$row[28]\t$row[29]\t$row[30]\t$row[31]\t$row[32]\t$row[33]\t$row[34]$extended_vl_fields_DATA";
$export_list_id[$i] = $row[0];
$export_lead_id[$i] = $row[1];
@@ -366,7 +367,7 @@ while ($i < $leads_to_print)
else
{
if ($extended_vl_fields > 0)
- {$extended_vl_fields_DATA = "\t$row[34]\t$row[35]\t$row[36]\t$row[37]\t$row[38]\t$row[39]\t$row[40]\t$row[41]\t$row[42]\t$row[43]\t$row[44]\t$row[45]\t$row[46]\t$row[47]\t$row[48]\t$row[49]\t$row[50]\t$row[51]\t$row[52]\t$row[53]";}
+ {$extended_vl_fields_DATA = "\t$row[34]\t$row[35]\t$row[36]\t$row[37]\t$row[38]\t$row[39]\t$row[40]\t$row[41]\t$row[42]\t$row[43]\t$row[44]\t$row[45]\t$row[46]\t$row[47]\t$row[48]\t$row[49]\t$row[50]\t$row[51]\t$row[52]\t$row[53]\t$row[54]\t$row[55]\t$row[56]\t$row[57]\t$row[58]\t$row[59]\t$row[60]\t$row[61]\t$row[62]\t$row[63]\t$row[64]\t$row[65]\t$row[66]\t$row[67]\t$row[68]\t$row[69]\t$row[70]\t$row[71]\t$row[72]\t$row[73]\t$row[74]\t$row[75]\t$row[76]\t$row[77]\t$row[78]\t$row[79]\t$row[80]\t$row[81]\t$row[82]\t$row[83]\t$row[84]\t$row[85]\t$row[86]\t$row[87]\t$row[88]\t$row[89]\t$row[90]\t$row[91]\t$row[92]\t$row[93]\t$row[94]\t$row[95]\t$row[96]\t$row[97]\t$row[98]\t$row[99]\t$row[100]\t$row[101]\t$row[102]\t$row[103]\t$row[104]\t$row[105]\t$row[106]\t$row[107]\t$row[108]\t$row[109]\t$row[110]\t$row[111]\t$row[112]\t$row[113]\t$row[114]\t$row[115]\t$row[116]\t$row[117]\t$row[118]\t$row[119]\t$row[120]\t$row[121]\t$row[122]\t$row[123]\t$row[124]\t$row[125]\t$row[126]\t$row[127]\t$row[128]\t$row[129]\t$row[130]\t$row[131]\t$row[132]";}
$row_data[$i] .= "$row[0]\t$row[1]\t$row[2]\t$row[3]\t$row[4]\t$row[5]\t$row[6]\t$row[7]\t$row[8]\t$row[9]\t$row[10]\t$row[11]\t$row[12]\t$row[13]\t$row[14]\t$row[15]\t$row[16]\t$row[17]\t$row[18]\t$row[19]\t$row[20]\t$row[21]\t$row[22]\t$row[23]\t$row[24]\t$row[25]\t$row[26]\t$row[27]\t$row[28]\t$row[29]\t$row[30]\t$row[31]\t$row[32]\t$row[33]$extended_vl_fields_DATA";
$export_list_id[$i] = $list_id;
$export_lead_id[$i] = $row[0];