From: Regina Obe <lr@pcorp.us>
Date: Mon, 30 May 2011 00:30:58 +0000 (+0000)
Subject: add remarked out line to set search path -- suggested by Brian Hamlin.  Also some... 
X-Git-Tag: 2.0.0alpha1~1530
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed97504976b7106e3cb018141693b1bbf976a108;p=postgis

add remarked out line to set search path -- suggested by Brian Hamlin.  Also some other minor changes

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

diff --git a/extras/tiger_geocoder/tiger_2010/create_geocode.bat b/extras/tiger_geocoder/tiger_2010/create_geocode.bat
index 2a4d3158e..8cbe16c82 100644
--- a/extras/tiger_geocoder/tiger_2010/create_geocode.bat
+++ b/extras/tiger_geocoder/tiger_2010/create_geocode.bat
@@ -10,6 +10,8 @@ set PGCONTRIB=C:\Program Files\PostgreSQL\9.0\share\contrib
 REM If you are using PostgreSQL 9.1 or above, use the extension syntax instead as shown below
 REM "%PGBIN%\psql"  -d "%THEDB%" -c "CREATE EXTENSION fuzzystrmatch" 
 "%PGBIN%\psql"  -d "%THEDB%" -c "CREATE SCHEMA tiger"
+REM unremark this next line and edit if you want the search paths set as part of the install
+REM ${PSQL_CMD} -d "%THEDB%" -c "ALTER DATABASE %THEDB% SET search_path=public, tiger;"
 "%PGBIN%\psql"  -d "%THEDB%" -f "tables\lookup_tables_2010.sql"
 "%PGBIN%\psql"  -d "%THEDB%" -c "CREATE SCHEMA tiger_data"
 "%PGBIN%\psql"  -d "%THEDB%" -f "tiger_loader.sql"
diff --git a/extras/tiger_geocoder/tiger_2010/create_geocode.sh b/extras/tiger_geocoder/tiger_2010/create_geocode.sh
index 27328768d..6f0b15cd2 100644
--- a/extras/tiger_geocoder/tiger_2010/create_geocode.sh
+++ b/extras/tiger_geocoder/tiger_2010/create_geocode.sh
@@ -11,6 +11,8 @@ PGCONTRIB=/usr/share/postgresql/contrib
 ${PSQL_CMD} -d "${THEDB}" -f "${PGCONTRIB}/fuzzystrmatch.sql"
 #${PSQL_CMD} -d "${THEDB}" -c "CREATE EXTENSION fuzzystrmatch" 
 ${PSQL_CMD} -d "${THEDB}" -c "CREATE SCHEMA tiger"
+#unremark this next line and edit if you want the search paths set as part of the install
+#${PSQL_CMD} -d "${THEDB}" -c "ALTER DATABASE ${THEDB} SET search_path=public, tiger;"
 ${PSQL_CMD} -d "${THEDB}" -f "tables/lookup_tables_2010.sql"
 ${PSQL_CMD} -d "${THEDB}" -c "CREATE SCHEMA tiger_data"
 ${PSQL_CMD} -d "${THEDB}" -f "tiger_loader.sql"
diff --git a/extras/tiger_geocoder/tiger_2010/tiger_loader.sql b/extras/tiger_geocoder/tiger_2010/tiger_loader.sql
index c215ff2a8..7a143b3c8 100644
--- a/extras/tiger_geocoder/tiger_2010/tiger_loader.sql
+++ b/extras/tiger_geocoder/tiger_2010/tiger_loader.sql
@@ -66,7 +66,7 @@ STATEDIR="${staging_fold}/${website_root}/${state_fold}"
 TMPDIR="${staging_fold}/temp/"
 UNZIPTOOL=unzip
 WGETTOOL="/usr/bin/wget"
-PGBIN="/usr/pgsql-9.0/bin"
+export PGBIN=/usr/pgsql-9.0/bin
 export PGPORT=5432
 export PGHOST=localhost
 export PGUSER=postgres