From dc2af6fda40dc6c4dd457abc910316deaf703951 Mon Sep 17 00:00:00 2001
From: Dan 'Ducky' Little <danlittle@yahoo.com>
Date: Fri, 23 Dec 2011 08:28:20 -0600
Subject: [PATCH] Probably too many changes for one commit but here they are: -
 Made SHP2SQLITE an environment variable and pointed it to the build in src -
 Removed the requirement for the two-level path in SOURCE, I think it makes
 sense to import a flat directory and use find or a shell script as
 apporpriate to feed tiger import - Added place.sql execution back into the
 script after modifying it to drop and recreate the places table as
 necessary.'

---
 build/tiger_import | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/tiger_import b/build/tiger_import
index 9256ce9..3f7755f 100755
--- a/build/tiger_import
+++ b/build/tiger_import
@@ -7,6 +7,7 @@ BASE=$(dirname $0)
 PATH=$PATH:$BASE
 SQL="$BASE/sql"
 HELPER_LIB="$BASE/../lib/geocoder/us/sqlite3.so"
+SHP2SQLITE=../src/shp2sqlite/shp2sqlite 
 DATABASE=$1
 SOURCE=$2
 shift
@@ -15,8 +16,9 @@ shift
 mkdir -p $TMP || exit 1
 
 # Initialize the database if it doesn't exist.
-#[ ! -r $DATABASE ] && cat ${SQL}/{create,place}.sql | sqlite3 $DATABASE
-[ ! -r $DATABASE ] && cat ${SQL}/create.sql | sqlite3 $DATABASE
+# Added places back in after adding the "drop if exists" directive to the SQL file. theduckylittle, 2011/12/15
+[ ! -r $DATABASE ] && cat ${SQL}/{create,place}.sql | sqlite3 $DATABASE
+#[ ! -r $DATABASE ] && cat ${SQL}/create.sql | sqlite3 $DATABASE
  
 # Marshal the county directories to import.
 #
@@ -25,7 +27,7 @@ if [ x"$1" != x"" ]; then
     cat
 else
     # Otherwise, find all of the IDs from the contents of the directory structure.
-    ls $SOURCE/*/*/tl_*_edges.zip | while read file; do
+    ls $SOURCE/tl_*_edges.zip | while read file; do
         file=$(basename $file)
         code=${file##tl_????_}
         echo ${code%%_edges.zip}
@@ -34,8 +36,8 @@ fi | sort | while read code; do
     echo "--- $code"
     # Unpack the county files into the temp directory.
     for file in $SHPS $DBFS; do
-	ZIP=$(ls $SOURCE/*/*/*_${code}_${file}.zip 2>/dev/null)
-	SHP=$(ls $SOURCE/*/*/*_${code}_${file}.* 2>/dev/null)
+	ZIP=$(ls $SOURCE/*_${code}_${file}.zip 2>/dev/null)
+	SHP=$(ls $SOURCE/*_${code}_${file}.* 2>/dev/null)
 	if [ x"$ZIP" != x"" ]; then
 	    unzip -q $ZIP -d $TMP
 	elif [ x"$SHP" != x"" ]; then
@@ -49,7 +51,7 @@ fi | sort | while read code; do
      cat ${SQL}/setup.sql && \
      for file in $SHPS; do
        # Convert each Shapefile into SQL statements.
-       shp2sqlite -aS ${TMP}/*_${file}.shp tiger_${file}
+	${SHP2SQLITE} -aS ${TMP}/*_${file}.shp tiger_${file}
      done && \
      for file in $DBFS; do
        # Convert each DBF into SQL statements likewise.