From: Regina Obe <lr@pcorp.us>
Date: Thu, 8 Aug 2013 23:11:53 +0000 (+0000)
Subject: dupe 2934 (give Northwest next id), get rid of hard-coding of schemas in sh line
X-Git-Tag: 2.2.0rc1~1417
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa885c84f4e5466d6740e21f2ed244da776c5924;p=postgis

dupe 2934 (give Northwest next id), get rid of hard-coding of schemas in sh line

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

diff --git a/extras/tiger_geocoder/tiger_2011/tiger_loader_2012.sql b/extras/tiger_geocoder/tiger_2011/tiger_loader_2012.sql
index 051cf3b56..9f9e8b2e6 100644
--- a/extras/tiger_geocoder/tiger_2011/tiger_loader_2012.sql
+++ b/extras/tiger_geocoder/tiger_2011/tiger_loader_2012.sql
@@ -76,8 +76,9 @@ set PSQL="%PGBIN%psql"
 set SHP2PGSQL="%PGBIN%shp2pgsql"
 cd ${staging_fold}
 ', E'del %TMPDIR%\\*.* /Q
-%PSQL% -c "DROP SCHEMA ${staging_schema} CASCADE;"
-%PSQL% -c "CREATE SCHEMA ${staging_schema};"
+%PSQL% -c "DROP SCHEMA IF EXISTS ${staging_schema} CASCADE;"
+%PSQL% -c "CREATE SCHEMA IF NOT EXISTS ${staging_schema};"
+%PSQL% -c "CREATE SCHEMA IF NOT EXISTS ${data_schema};"
 for /r %%z in (*.zip) do %UNZIPTOOL% e %%z  -o%TMPDIR% 
 cd %TMPDIR%', E'%PSQL%', E'\\', E'%SHP2PGSQL%', 'set ', 
 'for /r %%z in (*${table_name}.dbf) do (${loader}  -s 4269 -g the_geom -W "latin1" %%z tiger_staging.${state_abbrev}_${table_name} | ${psql} & ${psql} -c "SELECT loader_load_staged_data(lower(''${state_abbrev}_${table_name}''), lower(''${state_abbrev}_${lookup_name}''));")'
@@ -99,8 +100,9 @@ PSQL=${PGBIN}/psql
 SHP2PGSQL=${PGBIN}/shp2pgsql
 cd ${staging_fold}
 ', E'rm -f ${TMPDIR}/*.*
-${PSQL} -c "DROP SCHEMA tiger_staging CASCADE;"
-${PSQL} -c "CREATE SCHEMA tiger_staging;"
+${PSQL} -c "DROP SCHEMA IF EXISTS ${staging_schema} CASCADE;"
+${PSQL} -c "CREATE SCHEMA IF NOT EXISTS ${staging_schema};"
+${PSQL} -c "CREATE SCHEMA IF NOT EXISTS ${data_schema};"
 
 for z in *.zip; do $UNZIPTOOL -o -d $TMPDIR $z; done
 for z in */*.zip; do $UNZIPTOOL -o -d $TMPDIR $z; done