X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b062e7e7744d9f8f4a28d9c62197143d7352569d..eba6e46c74abfc828f385fa883332f85a4a429f6:/utils/imports.php

diff --git a/utils/imports.php b/utils/imports.php
index 939f2706..9d1085f0 100755
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
@@ -7,7 +7,7 @@ ini_set('memory_limit', '800M');
 
 $aCMDOptions
  = array(
-    "Create and setup nominatim search system",
+    'Create and setup nominatim search system',
     array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
     array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
     array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
@@ -29,21 +29,23 @@ if (isset($aCMDResult['parse-tiger'])) {
         preg_match('#([0-9]{5})_(.*)#', basename($sImportFile), $aMatch);
         $sCountyID = $aMatch[1];
 
-        echo "Processing ".$sCountyID."...\n";
+        echo 'Processing '.$sCountyID."...\n";
         $sUnzipCmd = "unzip -d $sTempDir $sImportFile";
         exec($sUnzipCmd);
 
         $sShapeFilename = $sTempDir.'/'.basename($sImportFile, '.zip').'.shp';
-        $sSqlFilename = CONST_Tiger_Data_Path.'/'.$sCountyID.'.sql')
+        $sSqlFilenameTmp = $sTempDir.'/'.$sCountyID.'.sql';
+        $sSqlFilename = CONST_Tiger_Data_Path.'/'.$sCountyID.'.sql';
 
         if (!file_exists($sShapeFilename)) {
             echo "Failed unzip ($sImportFile)\n";
         } else {
-            $sParseCmd = CONST_BasePath.'/utils/tigerAddressImport.py '.$sShapeFilename.' '.$sSqlFilename;
+            $sParseCmd = CONST_BasePath.'/utils/tigerAddressImport.py '.$sShapeFilename.' '.$sSqlFilenameTmp;
             exec($sParseCmd);
-            if (!file_exists($sOsmFile)) {
+            if (!file_exists($sSqlFilenameTmp)) {
                 echo "Failed parse ($sImportFile)\n";
-                if file_exists($sSqlFilename) unlink($sSqlFilename);
+            } else {
+                copy($sSqlFilenameTmp, $sSqlFilename);
             }
         }
         // Cleanup