From 5e9034c40e448e590cc530ab411b043cdece08b4 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Mon, 30 May 2011 09:45:36 +0000 Subject: [PATCH] get rid of bash line -- seems unnecessary and breaks if multiple states. Forgot cd which was making secondary states fail loading. git-svn-id: http://svn.osgeo.org/postgis/trunk@7293 b70326c6-7e19-0410-871a-916f4a2858ee --- extras/tiger_geocoder/tiger_2010/tiger_loader.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extras/tiger_geocoder/tiger_2010/tiger_loader.sql b/extras/tiger_geocoder/tiger_2010/tiger_loader.sql index 7a143b3c8..f701222f7 100644 --- a/extras/tiger_geocoder/tiger_2010/tiger_loader.sql +++ b/extras/tiger_geocoder/tiger_2010/tiger_loader.sql @@ -49,6 +49,7 @@ set PGPASSWORD=yourpasswordhere set PGDATABASE=geocoder 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};" @@ -61,8 +62,7 @@ cd %TMPDIR%', E'%PSQL%', E'\\', E'%SHP2PGSQL%', 'set ', INSERT INTO loader_platform(os, wget, pgbin, declare_sect, unzip_command, psql, path_sep, loader, environ_set_command, county_process_command) VALUES('sh', 'wget', '', -E'#!/bin/bash -STATEDIR="${staging_fold}/${website_root}/${state_fold}" +E'STATEDIR="${staging_fold}/${website_root}/${state_fold}" TMPDIR="${staging_fold}/temp/" UNZIPTOOL=unzip WGETTOOL="/usr/bin/wget" @@ -74,6 +74,7 @@ export PGPASSWORD=yourpasswordhere export PGDATABASE=geocoder 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;" -- 2.50.1