ViciDial/agc_2-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added city,state,postcode,country to data fields in nanpa prefix list table

Browse Source 
git-svn-id: svn://192.168.202.10@1077 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2009-03-18 04:17:19 +00:00
parent d5d7326eff
commit 239ed6d18a
4 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UPGRADE
+14 -1
View File
@@ -8,7 +8,20 @@ NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom
########## UPGRADING FROM 2.0.5 TO 2.2.0 ##########
Nothing yet, this was just branched
1. install new files:
perl ./install.pl
NOTES: If you have customized any scripts in the bin or agi folders,
then make sure you back them up before running the install.pl script.
This script will replace existing files in the astguiclient installation.
2. upgrade the MySQL asterisk database:
mysql
use asterisk
\. /path/from/root/extras/upgrade_2.2.0.sql
quit
########## UPGRADING FROM 2.0.4 TO 2.0.5 ##########
bin/ADMIN_area_code_populate.pl
+15 -7
View File
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
# ADMIN_area_code_populate.pl version 2.0.5
# ADMIN_area_code_populate.pl version 2.2.0
#
# Copyright (C) 2009 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
@@ -16,6 +16,7 @@
# 90129-0932 - Added optional NANP prefix/time date import "--load-NANPA-prefix" flag
# 90131-0933 - Added purge-table option to clear out old records before adding new ones
# 90204-0806 - Added duplicate check to nanpa list loading
# 90317-2353 - Added city, state, postal_code, country to nanpa format
#
@@ -158,8 +159,8 @@ $dbhA = DBI->connect("DBI:mysql:$VARDB_database:$VARDB_server:$VARDB_port", "$VA
if ($nanpa_load > 0)
{
#### load special North American phone code prefix table ####
# LONG # NPA,NXX,,,,,,,,,,,,,TZ,DST,,,,,,,,,,,,LATITUDE,LONGITUDE,,,,,
# SHORT # NPA,NXX,TZ,DST,LATITUDE,LONGITUDE
# LONG # NPA,NXX,,,,,,STATE,COUNTRY,,,,,RC,TZ,DST,ZIP,,,,,,,,,,,LATITUDE,LONGITUDE,,,,,
# SHORT # NPA,NXX,TZ,DST,LATITUDE,LONGITUDE,CITY,STATE,POSTAL_CODE,COUNTRY
#### BEGIN vicidial_nanpa_prefix_codes population from NANPA_prefix-latest.txt file ####
open(prefixfile, "$PATHhome/NANPA_prefix-latest.txt") || die "can't open $PATHhome/NANPA_prefix-latest.txt: $!\n";
@@ -180,12 +181,12 @@ if ($nanpa_load > 0)
$ins_stmt="insert into vicidial_nanpa_prefix_codes VALUES ";
foreach (@prefixfile)
{
if (length($prefixfile[$pc])>60)
@row=split(/,/, $prefixfile[$pc]);
if ($#row > 20)
{$full_file++;}
if ( ($prefixfile[$pc] !~ /XXXXX/) && ($prefixfile[$pc] !~ /^\D|^0|^1/) )
{
$prefixfile[$pc] =~ s/\r|\n|\t| $//gi;
@row=split(/,/, $prefixfile[$pc]);
$pc++;
$temp_insert='';
$dup_check=0;
@@ -193,6 +194,9 @@ if ($nanpa_load > 0)
{
if ($row[14] !~ /XX/)
{
$row[13] =~ s/\(.*//gi;
$row[13] =~ s/ $//gi;
$row[13] =~ s/\'/\\\'/gi;
$row[14] =~ s/NT/-3.50/gi;
$row[14] =~ s/AT/-4.00/gi;
$row[14] =~ s/ET/-5.00/gi;
@@ -204,11 +208,15 @@ if ($nanpa_load > 0)
$row[14] =~ s/AS/-11.00/gi;
$row[14] =~ s/CH/10.00/gi;
$row[15] =~ s/X/N/gi;
$temp_insert="('$row[0]', '$row[1]', '$row[14]', '$row[15]', '$row[27]', '$row[28]'), ";
$temp_insert="('$row[0]', '$row[1]', '$row[14]', '$row[15]', '$row[27]', '$row[28]', '$row[13]', '$row[7]', '$row[16]', '$row[8]'), ";
}
}
else
{$temp_insert="('$row[0]', '$row[1]', '$row[2]', '$row[3]', '$row[4]', '$row[5]'), ";}
{
$row[6] =~ s/\'/\\\'/gi;
$row[9] =~ s/\r|\n|\t| $//gi;
$temp_insert="('$row[0]', '$row[1]', '$row[2]', '$row[3]', '$row[4]', '$row[5]', '$row[6]', '$row[7]', '$row[8]', '$row[9]'), ";
}
$stmtA = "SELECT count(*) FROM vicidial_nanpa_prefix_codes where areacode='$row[0]' and prefix='$row[1]';";
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
extras/MySQL_AST_CREATE_tables.sql
+6 -2
View File
@@ -1369,7 +1369,11 @@ prefix CHAR(3),
GMT_offset VARCHAR(6),
DST enum('Y','N'),
latitude VARCHAR(17),
longitude VARCHAR(17)
longitude VARCHAR(17),
city VARCHAR(50) default '',
state VARCHAR(2) default '',
postal_code VARCHAR(10) default '',
country VARCHAR(2) default ''
);
CREATE INDEX areaprefix on vicidial_nanpa_prefix_codes (areacode,prefix);
@@ -1531,7 +1535,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='1135';
UPDATE system_settings SET db_schema_version='1136';
GRANT RELOAD ON *.* TO cron@'%';
GRANT RELOAD ON *.* TO cron@localhost;
extras/upgrade_2.2.0.sql
+6
View File
@@ -0,0 +1,6 @@
ALTER TABLE vicidial_nanpa_prefix_codes ADD city VARCHAR(50) default '';
ALTER TABLE vicidial_nanpa_prefix_codes ADD state VARCHAR(2) default '';
ALTER TABLE vicidial_nanpa_prefix_codes ADD postal_code VARCHAR(10) default '';
ALTER TABLE vicidial_nanpa_prefix_codes ADD country VARCHAR(2) default '';
UPDATE system_settings SET db_schema_version='1136', version='2.2.0b0.5';