Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / imports.php

diff --git a/utils/imports.php b/utils/imports.php
index 939f270690ab939d30b5d864c79501099b0ee463..fce65ab9a5d28b4a86632a1aa7e6145764ac5d9c 100755 (executable)
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -34,16 +34,18 @@ if (isset($aCMDResult['parse-tiger'])) {
         exec($sUnzipCmd);
 
         $sShapeFilename = $sTempDir.'/'.basename($sImportFile, '.zip').'.shp';
         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 {
 
         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);
             exec($sParseCmd);

-            if (!file_exists($sOsmFile)) {
+            if (!file_exists($sSqlFilenameTmp)) {

                 echo "Failed parse ($sImportFile)\n";
                 echo "Failed parse ($sImportFile)\n";

-                if file_exists($sSqlFilename) unlink($sSqlFilename);
+            } else {
+                copy($sSqlFilenameTmp, $sSqlFilename);

             }
         }
         // Cleanup
             }
         }
         // Cleanup