Just enough to make it compile but doesn't work yet

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

diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 3bdd4ce7e35098bd0f341fa379809fc6fd543ebc..bc5f28a9cf1d7e40472d32a974c7e6c91091ad7e 100644 (file)
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -1,124 +1,124 @@
-include ../upgradeable_versions.mk\r
-\r
-EXTENSION    = postgis_tiger_geocoder\r
-EXTVERSION    = @POSTGIS_LIB_VERSION@\r
-MINORVERSION  = 2011.@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@\r
-\r
-MICRO_NUMBER  = $(shell echo $(EXTVERSION) | sed "s/[0-9]\.[0-9]\.\([0-9]*\)[a-zA-Z]*[0-9]*/\1/")\r
-PREREL_NUMBER = $(shell echo $(EXTVERSION) | \\r
-                        sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \\r
-                        grep "[a-zA-Z]" | \\r
-                        sed "s/[0-9][a-zA-Z]\([0-9]*\)[a-zA-Z]*/\1/")\r
-MICRO_PREV    = $(shell if test "$(MICRO_NUMBER)x" != "x"; then expr $(MICRO_NUMBER) - 1; fi)\r
-PREREL_PREV   = $(shell if test "$(PREREL_NUMBER)x" != "x"; then expr $(PREREL_NUMBER) - 1; fi)\r
-\r
-PREREL_PREFIX = $(shell echo $(EXTVERSION) | \\r
-                        sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \\r
-                        grep "[a-zA-Z]" | \\r
-                        sed "s/\([0-9][a-zA-Z]*\)[0-9]*/\1/")\r
-\r
-DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))\r
-\r
-PG_CONFIG    = @PGCONFIG@\r
-\r
-PG91         = $(shell $(PG_CONFIG) --version | grep -qE " 8\.| 9\.0" && echo no || echo yes)\r
-SQL_BITS     = $(wildcard sql_bits/*.sql)\r
-EXTRA_CLEAN += sql/*.sql ${SQL_BITS}\r
-\r
-\r
-ifeq ($(PG91),yes)\r
-all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql_minor_upgrade\r
-\r
-sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql\r
-       cp $< $@\r
-       \r
-sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql  sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql\r
-       cat $^ > $@\r
-       \r
-#strip BEGIN/COMMIT since these are not allowed in extensions\r
-#strip CREATE SCHEMA since we force extension \r
-# to create schema by setting schema to tiger_geocoder in control\r
-sql/tiger_geocoder.sql.in: ../../extras/tiger_geocoder/tiger_2011/utility/set_search_path.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/tables/lookup_tables_2011.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode_settings.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/utility/utmzone.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/utility/cull_null.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/utility/nullable_levenshtein.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/utility/levenshtein_ignore_case.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/end_soundex.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/count_words.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/state_extract.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/get_last_words.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract_countysub_exact.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract_countysub_fuzzy.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract_place_exact.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract_place_fuzzy.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/../../extras/tiger_geocoder/tiger_2011/normalize_address.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/normalize/pprint_addy.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/other_helper_functions.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/rate_attributes.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/includes_address.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/interpolate_from_address.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/geocode_address.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/geocode_location.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/geocode_intersection.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/geocode.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/reverse_geocode.sql \\r
-       ../../extras/tiger_geocoder/tiger_2011/geocode/census_tracts_functions.sql \r
-       cat $^ > $@\r
-sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in\r
-       sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;'  $< > $@\r
-       \r
-../../doc/tiger_geocoder_comments.sql:\r
-       $(MAKE) -C ../../doc comments\r
-       \r
-sql_bits/tiger_geocoder_comments.sql: ../../doc/tiger_geocoder_comments.sql\r
-       cp $< $@\r
-       \r
-#grep all lines that start with CREATE OR REPLACE FUNCTION, TRIGGER...\r
-#then replace CREATE OR REPLACE .. with ALTER EXTENSION..;\r
-#then remove default values and extra junk\r
-# sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../tiger_geocoder/tiger_geocoder.sql\r
-#      sed -e '/^CREATE \(OR REPLACE\|TYPE\|TABLE\|VIEW\|CAST\)/!d;' \\r
-#              -e 's/OR REPLACE//g' \\r
-#              -e 's/CREATE\(.*\)/ALTER EXTENSION $(EXTENSION) ADD\1;/' \\r
-#              -e 's/DEFAULT [\.0-9a-zA-Z]\+//g' \\r
-#              -e 's/\(BEFORE\|WITH FUNCTION\)\(.*\)/;/' \\r
-#              -e 's/[ \t]+;/;/' \\r
-#              -e 's/(;/;/' \\r
-#              -e 's/\\(;/;/' \\r
-#              -e 's/;;/;/g' $< > $@\r
-\r
-#hardcode for now using \r
-#the extensions/make_unpackaged.sql script form an install\r
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/tiger_geocoder--unpackaged.sql.in\r
-       cp $< $@\r
-\r
-#upgrade script should have everything but table, schema, type creation/alter\r
-#NOTE: we assume all object definitions end in ;\r
-#first expression deletes all non-removable objects defined on same line\r
-#second deletes all non-removable defined on multiple lines \r
-#  the end of the body of object we assume ends in ;\r
-#aggregates are special \r
-#they can be dropped but we need to remove\r
-#them from the extension first\r
-sql/tiger_geocoder_upgrade_minor.sql:  sql_bits/tiger_geocoder.sql\r
-        sed -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\).*;/d' \\r
-                -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \\r
-                $< > $@\r
-       \r
-sql_minor_upgrade: ../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\r
-       for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \\r
-         cat $^ > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \\r
-       done\r
-\r
-DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql\r
-EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql\r
-endif\r
-\r
-distclean: clean\r
-       rm Makefile\r
-\r
-PGXS := $(shell $(PG_CONFIG) --pgxs)\r
-include $(PGXS)\r
+include ../upgradeable_versions.mk
+
+EXTENSION    = postgis_tiger_geocoder
+EXTVERSION    = 2.1.0SVN
+MINORVERSION  = 2011.2.1
+
+MICRO_NUMBER  = $(shell echo $(EXTVERSION) | sed "s/[0-9]\.[0-9]\.\([0-9]*\)[a-zA-Z]*[0-9]*/\1/")
+PREREL_NUMBER = $(shell echo $(EXTVERSION) | \
+                        sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \
+                        grep "[a-zA-Z]" | \
+                        sed "s/[0-9][a-zA-Z]\([0-9]*\)[a-zA-Z]*/\1/")
+MICRO_PREV    = $(shell if test "$(MICRO_NUMBER)x" != "x"; then expr $(MICRO_NUMBER) - 1; fi)
+PREREL_PREV   = $(shell if test "$(PREREL_NUMBER)x" != "x"; then expr $(PREREL_NUMBER) - 1; fi)
+
+PREREL_PREFIX = $(shell echo $(EXTVERSION) | \
+                        sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \
+                        grep "[a-zA-Z]" | \
+                        sed "s/\([0-9][a-zA-Z]*\)[0-9]*/\1/")
+
+DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
+
+PG_CONFIG    = /c/projects/pg/pg91/bin/pg_config
+
+PG91         = $(shell $(PG_CONFIG) --version | grep -qE " 8\.| 9\.0" && echo no || echo yes)
+SQL_BITS     = $(wildcard sql_bits/*.sql)
+EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
+
+
+ifeq ($(PG91),yes)
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql_minor_upgrade
+
+sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
+       cp $< $@
+       
+sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql  sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql
+       cat $^ > $@
+       
+#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
+sql_bits/tiger_geocoder.sql.in: ../../extras/tiger_geocoder/tiger_2011/utility/set_search_path.sql \
+       ../../extras/tiger_geocoder/tiger_2011/tables/lookup_tables_2011.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode_settings.sql \
+       ../../extras/tiger_geocoder/tiger_2011/utility/utmzone.sql \
+       ../../extras/tiger_geocoder/tiger_2011/utility/cull_null.sql \
+       ../../extras/tiger_geocoder/tiger_2011/utility/nullable_levenshtein.sql \
+       ../../extras/tiger_geocoder/tiger_2011/utility/levenshtein_ignore_case.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/end_soundex.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/count_words.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/state_extract.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/get_last_words.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract_countysub_exact.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract_countysub_fuzzy.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract_place_exact.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract_place_fuzzy.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/location_extract.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/normalize_address.sql \
+       ../../extras/tiger_geocoder/tiger_2011/normalize/pprint_addy.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/other_helper_functions.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/rate_attributes.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/includes_address.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/interpolate_from_address.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/geocode_address.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/geocode_location.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/geocode_intersection.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/geocode.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/reverse_geocode.sql \
+       ../../extras/tiger_geocoder/tiger_2011/geocode/census_tracts_functions.sql
+       cat $^ > $@
+sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in
+       sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;'  $< > $@
+       
+../../doc/tiger_geocoder_comments.sql:
+       $(MAKE) -C ../../doc comments
+       
+sql_bits/tiger_geocoder_comments.sql: ../../doc/tiger_geocoder_comments.sql
+       cp $< $@
+       
+#grep all lines that start with CREATE OR REPLACE FUNCTION, TRIGGER...
+#then replace CREATE OR REPLACE .. with ALTER EXTENSION..;
+#then remove default values and extra junk
+# sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../tiger_geocoder/tiger_geocoder.sql
+#      sed -e '/^CREATE \(OR REPLACE\|TYPE\|TABLE\|VIEW\|CAST\)/!d;' \
+#              -e 's/OR REPLACE//g' \
+#              -e 's/CREATE\(.*\)/ALTER EXTENSION $(EXTENSION) ADD\1;/' \
+#              -e 's/DEFAULT [\.0-9a-zA-Z]\+//g' \
+#              -e 's/\(BEFORE\|WITH FUNCTION\)\(.*\)/;/' \
+#              -e 's/[ \t]+;/;/' \
+#              -e 's/(;/;/' \
+#              -e 's/\\(;/;/' \
+#              -e 's/;;/;/g' $< > $@
+
+#hardcode for now using 
+#the extensions/make_unpackaged.sql script form an install
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/tiger_geocoder--unpackaged.sql.in
+       cp $< $@
+
+#upgrade script should have everything but table, schema, type creation/alter
+#NOTE: we assume all object definitions end in ;
+#first expression deletes all non-removable objects defined on same line
+#second deletes all non-removable defined on multiple lines 
+#  the end of the body of object we assume ends in ;
+#aggregates are special 
+#they can be dropped but we need to remove
+#them from the extension first
+sql/tiger_geocoder_upgrade_minor.sql:  sql_bits/tiger_geocoder.sql
+        sed -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\).*;/d' \
+                -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \
+                $< > $@
+       
+sql_minor_upgrade: ../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
+       for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
+         cat $^ > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
+       done
+
+DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql
+EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
+endif
+
+distclean: clean
+       rm Makefile
+
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)

diff --git a/extensions/postgis_tiger_geocoder/sql_bits/mark_editable_objects.sql.in b/extensions/postgis_tiger_geocoder/sql_bits/mark_editable_objects.sql.in
new file mode 100644 (file)
index 0000000..eae6bc5
--- /dev/null
+++ b/extensions/postgis_tiger_geocoder/sql_bits/mark_editable_objects.sql.in
@@ -0,0 +1 @@
+SELECT pg_catalog.pg_extension_config_dump('geocode_settings', '');

diff --git a/extensions/postgis_tiger_geocoder/sql_bits/remove_from_extension.sql.in b/extensions/postgis_tiger_geocoder/sql_bits/remove_from_extension.sql.in
new file mode 100644 (file)
index 0000000..c94313d
--- /dev/null
+++ b/extensions/postgis_tiger_geocoder/sql_bits/remove_from_extension.sql.in
@@ -0,0 +1,20 @@
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\r
+-- \r
+-- $Id: remove_from_extension.sql.in 9324 2012-02-27 22:08:12Z pramsey $\r
+----\r
+-- PostGIS - Spatial Types for PostgreSQL\r
+-- http://www.postgis.org\r
+--\r
+-- Copyright (C) 2011 Regina Obe <lr@pcorp.us>\r
+--\r
+-- This is free software; you can redistribute and/or modify it under\r
+-- the terms of the GNU General Public Licence. See the COPYING file.\r
+--\r
+-- Author: Regina Obe <lr@pcorp.us>\r
+--  \r
+-- This drops extension helper functions\r
+-- and should be called at the end of the extension upgrade file\r
+-- removes all postgis_topology functions from postgis_topology extension since they will be readded \r
+-- during upgrade\r
+SELECT postgis_extension_remove_objects('postgis_tiger_geocoder', 'FUNCTION');\r
+SELECT postgis_extension_remove_objects('postgis_tiger_geocoder', 'AGGREGATE');\r

diff --git a/extensions/postgis_tiger_geocoder/sql_bits/tiger_geocoder--unpackaged.sql.in b/extensions/postgis_tiger_geocoder/sql_bits/tiger_geocoder--unpackaged.sql.in
new file mode 100644 (file)
index 0000000..e69de29