#2193: implement upgrade next next functionality hack, implement swap -- SELECT set_g...

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

diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index d70e218f137dd531853dedba5b67cd6ca40adccf..1686278f9bd1c5f2b21c208746a3bff380d1c88a 100644 (file)
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -27,7 +27,7 @@ EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
 
 
 ifeq ($(PG91),yes)
-all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql_minor_upgrade
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql  sql_minor_upgrade
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
        cp $< $@
@@ -35,6 +35,12 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
 sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql  sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql
        cat $^ > $@
        
+#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 $< $@
+sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
+       cp $< $@
+       
 #strip BEGIN/COMMIT since these are not allowed in extensions
 #strip CREATE SCHEMA since we force extension 
 # to create schema by setting schema to tiger_geocoder in control
@@ -156,7 +162,7 @@ sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extensio
        for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
          cat $^ > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
        done
-
+       
 DATA = $(wildcard sql/*--*.sql)
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
 endif

diff --git a/extras/tiger_geocoder/tiger_2011/normalize/normalize_address.sql b/extras/tiger_geocoder/tiger_2011/normalize/normalize_address.sql
index a93f0a90ddd6422a7e360a914b18fbc360b324aa..0c47b8e87e451414b6a66ac8ab7019846ae1c67c 100644 (file)
--- a/extras/tiger_geocoder/tiger_2011/normalize/normalize_address.sql
+++ b/extras/tiger_geocoder/tiger_2011/normalize/normalize_address.sql
@@ -57,6 +57,7 @@ CREATE OR REPLACE FUNCTION normalize_address(in_rawinput character varying)
 $$
 DECLARE
   debug_flag boolean := get_geocode_setting('debug_normalize_address')::boolean;
+  use_pagc boolean := COALESCE(get_geocode_setting('use_pagc_address_parser')::boolean, false);
   result norm_addy;
   addressString VARCHAR;
   zipString VARCHAR;
@@ -77,6 +78,10 @@ DECLARE
 BEGIN
 --$Id$-
   result.parsed := FALSE;
+  IF use_pagc THEN
+       result := pagc_normalize_address(in_rawinput);
+       RETURN result;
+  END IF;
 
   rawInput := trim(in_rawInput);