make phpcs happy

[nominatim.git] / utils / imports.php

diff --git a/utils/imports.php b/utils/imports.php
index 939f270690ab939d30b5d864c79501099b0ee463..07bc9c4512176da12e67c323854adbb22d41792b 100755 (executable)
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -7,7 +7,7 @@ ini_set('memory_limit', '800M');
 
 $aCMDOptions
  = array(
 
 $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'),
     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];
 
         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';
         $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 {
 
         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