X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=enrich_zips;h=33a6378833ca42acf38ac608b1cd3630beee2496;hp=28587df1ed948d4d1b2013c9761f89e848f82e54;hb=3bb6926bbb549af97fe1ce2698b7fc15852607fa;hpb=6aa33c3a44b3684b0b176ac0cc743106bd0348b5

diff --git a/enrich_zips b/enrich_zips
index 28587df..33a6378 100755
--- a/enrich_zips
+++ b/enrich_zips
@@ -1,5 +1,21 @@
 #!/usr/bin/perl -w
 
+# Copyright 2009-2012, Equinox Software, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 use strict;
 use Getopt::Long;
 
@@ -20,12 +36,16 @@ NOTES
 
 	Geonames database can be downloaded from http://download.geonames.org/export/zip/US.zip
 
+	Add the --believegn flag if you want to believe the Geonames database when it conflicts with patron data.
+
 =cut
 
-my ($db, $makezips, %zips, $warn);
-my $result = GetOptions ("db=s"     => \$db,
-                         "makezips" => \$makezips,
-                         "warn"     => \$warn);
+my ($db, $makezips, %zips, $warn, $believegn);
+my $result = GetOptions ("db=s"      => \$db,
+                         "makezips"  => \$makezips,
+                         "warn"      => \$warn,
+                         "believegn" => \$believegn);
+
 die
 	"Please specify the location of the Geonames database with --db US.txt\n" .
 	"HINT: You can download it at http://download.geonames.org/export/zip/US.zip" .
@@ -65,6 +85,12 @@ while (<>) {
 	}
 
 	if ($makezips) {
+		if (defined $zips{$zip} && ($city ne $dbcity || $state ne $dbstate)) {
+			if ($believegn) {
+				$city  = $dbcity;
+				$state = $dbstate;
+			}
+		}
 		print "|" . join("|", ($state, $city, $zip, "1", "", $county)) . "||\n";
 	} else {
 		print join("\t", ($city, $state, $zip, $county)) . "\n";