X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2a784fa3d4533d11e3227f868085dcee5a9870c6..2aca37f677121831beebf2276d60b8dd7a413c60:/utils/imports.php

diff --git a/utils/imports.php b/utils/imports.php
index 8dc2c820..07bc9c45 100755
--- a/utils/imports.php
+++ b/utils/imports.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'),
@@ -28,20 +28,24 @@ if (isset($aCMDResult['parse-tiger'])) {
         set_time_limit(30);
         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);
-        $sShapeFile = $sTempDir.'/'.basename($sImportFile, '.zip').'.shp';
-        if (!file_exists($sShapeFile)) {
+
+        $sShapeFilename = $sTempDir.'/'.basename($sImportFile, '.zip').'.shp';
+        $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 '.$sShapeFile;
+            $sParseCmd = CONST_BasePath.'/utils/tigerAddressImport.py '.$sShapeFilename.' '.$sSqlFilenameTmp;
             exec($sParseCmd);
-            $sOsmFile = $sTempDir.'/'.basename($sImportFile, '.zip').'.osm1.osm';
-            if (!file_exists($sOsmFile)) {
+            if (!file_exists($sSqlFilenameTmp)) {
                 echo "Failed parse ($sImportFile)\n";
             } else {
-                copy($sOsmFile, CONST_Tiger_Data_Path.'/'.$sCountyID.'.sql');
+                copy($sSqlFilenameTmp, $sSqlFilename);
             }
         }
         // Cleanup