From: marc tobias <mtmail@gmx.net>
Date: Sun, 22 Oct 2017 09:28:34 +0000 (+0200)
Subject: huge cleanup of tigerAddressImport.py
X-Git-Tag: v3.1.0~36
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a71200a57a2417e0c5dfba4fe42ecdb371da3dba

huge cleanup of tigerAddressImport.py
---

diff --git a/utils/imports.php b/utils/imports.php
index 939f2706..fce65ab9 100755
--- 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';
-        $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