#2261: fix creation of next next upgrade script, add null protection for pagc_normali...

git-svn-id: http://svn.osgeo.org/postgis/trunk@11247 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 1686278f9bd1c5f2b21c208746a3bff380d1c88a..dd5110a54964d9b9e80a9521e4c5e56dbc144cb5 100644 (file)
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -37,7 +37,7 @@ sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql  sql_bits/mark_editable_object
        
 #this is a cludge to allow upgrading from same SVN to same SVN
 sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql ../postgis_extension_helper_uninstall.sql
-       cp $< $@
+       cat $^ > $@
 sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
        cp $< $@
        

diff --git a/extras/tiger_geocoder/tiger_2011/pagc_normalize/pagc_normalize_address.sql b/extras/tiger_geocoder/tiger_2011/pagc_normalize/pagc_normalize_address.sql
index 5044e685da9ed2e16d172bb15b43636e84e1361d..541187b3fe4a5092b7f632a8999e96c4d75aa68a 100644 (file)
--- a/extras/tiger_geocoder/tiger_2011/pagc_normalize/pagc_normalize_address.sql
+++ b/extras/tiger_geocoder/tiger_2011/pagc_normalize/pagc_normalize_address.sql
@@ -24,8 +24,8 @@ BEGIN
   rec := (SELECT standardize_address( 'select seq, word::text, stdword::text, token from tiger.pagc_gaz union all select seq, word::text, stdword::text, token from tiger.pagc_lex '\r
        , 'select seq, word::text, stdword::text, token from tiger.pagc_gaz order by id'\r
        , 'select * from tiger.pagc_rules order by id'\r
-, 'select 0::int4 as id, ' || quote_literal(address1) || '::text As micro, \r
-   ' || quote_literal(city || ', ' || state || ' ' || zip) || '::text As macro') As pagc_addr\r
+, 'select 0::int4 as id, ' || quote_literal(COALESCE(address1,'')) || '::text As micro, \r
+   ' || quote_literal(COALESCE(city || ', ','') || COALESCE(state || ' ', '') || COALESCE(zip,'')) || '::text As macro') As pagc_addr\r
  FROM  (SELECT * FROM parse_address(rawInput) ) As a ) ;\r
  -- For address number only put numbers and stop if reach a non-number e.g. 123-456 will return 123\r
   result.address := to_number(substring(rec.house_num, '[0-9]+'), '99999999999');\r