second argument of array_merge can be empty

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index 1379045068ec6b2b614af28713c6387c2803bc3a..c6de7af6f9d2f4ba94e770af211ba6d8c61fbdfb 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -47,22 +47,19 @@
                showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
        }
 
                showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
        }
 

-       if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;

        if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
 
 /*
        // Lock to prevent multiple copies running
        if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1)
        {
        if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
 
 /*
        // Lock to prevent multiple copies running
        if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1)
        {

-               echo "Copy already running\n";
-               exit;
+               fail("Copy already running\n");

        }
        if (!isset($aResult['max-load'])) $aResult['max-load'] = 1.9;
        if (!isset($aResult['max-blocking'])) $aResult['max-blocking'] = 3;
        if (getBlockingProcesses() > $aResult['max-blocking'])
        {
        }
        if (!isset($aResult['max-load'])) $aResult['max-load'] = 1.9;
        if (!isset($aResult['max-blocking'])) $aResult['max-blocking'] = 3;
        if (getBlockingProcesses() > $aResult['max-blocking'])
        {

-               echo "Too many blocking processes for import\n";
-               exit;
+               fail("Too many blocking processes for import\n");

        }
 */
 
        }
 */
 


@@ -120,8 +117,7 @@
                        $sNextFile = $aResult['import-diff'];
                        if (!file_exists($sNextFile))
                        {
                        $sNextFile = $aResult['import-diff'];
                        if (!file_exists($sNextFile))
                        {

-                               echo "Cannot open $sNextFile\n";
-                               exit;
+                               fail("Cannot open $sNextFile\n");

                        }
                        // Don't update the import status - we don't know what this file contains
                        $sUpdateSQL = 'update import_status set lastimportdate = now() where false';
                        }
                        // Don't update the import status - we don't know what this file contains
                        $sUpdateSQL = 'update import_status set lastimportdate = now() where false';


@@ -137,8 +133,7 @@
 
                        if ($iErrorLevel)
                        {
 
                        if ($iErrorLevel)
                        {

-                               echo "Error from osm2pgsql, $iErrorLevel\n";
-                               exit;
+                               fail("Error from osm2pgsql, $iErrorLevel\n");

                        }
        
                        // Move the date onwards
                        }
        
                        // Move the date onwards


@@ -205,8 +200,7 @@
                        exec($sCMD, $sJunk, $iErrorLevel);
                        if ($iErrorLevel)
                        {
                        exec($sCMD, $sJunk, $iErrorLevel);
                        if ($iErrorLevel)
                        {

-                               echo "Error converting osm to osc, osmosis returned: $iErrorLevel\n";
-                               exit;
+                               fail("Error converting osm to osc, osmosis returned: $iErrorLevel\n");

                        }
                }
                else
                        }
                }
                else


@@ -221,8 +215,7 @@
                        $hProc = proc_open($sCMD, $aSpec, $aPipes);
                        if (!is_resource($hProc))
                        {
                        $hProc = proc_open($sCMD, $aSpec, $aPipes);
                        if (!is_resource($hProc))
                        {

-                               echo "Error converting osm to osc, osmosis failed\n";
-                               exit;
+                               fail("Error converting osm to osc, osmosis failed\n");

                        }
                        fwrite($aPipes[0], $sModifyXMLstr);
                        fclose($aPipes[0]);
                        }
                        fwrite($aPipes[0], $sModifyXMLstr);
                        fclose($aPipes[0]);


@@ -237,7 +230,7 @@
                                echo "Error converting osm to osc, osmosis returned: $iError\n";
                                echo $sOut;
                                echo $sErrors;
                                echo "Error converting osm to osc, osmosis returned: $iError\n";
                                echo $sOut;
                                echo $sErrors;

-                               exit;
+                               exit(-1);

                        }
                }
 
                        }
                }
 


@@ -247,8 +240,7 @@
                exec($sCMD, $sJunk, $iErrorLevel);
                if ($iErrorLevel)
                {
                exec($sCMD, $sJunk, $iErrorLevel);
                if ($iErrorLevel)
                {

-                       echo "osm2pgsql exited with error level $iErrorLevel\n";
-                       exit;
+                       fail("osm2pgsql exited with error level $iErrorLevel\n");

                }
        }
 
                }
        }
 


@@ -257,8 +249,7 @@
 
                $pgver = (float) CONST_Postgresql_Version;
                 if ($pgver < 9.3) {
 
                $pgver = (float) CONST_Postgresql_Version;
                 if ($pgver < 9.3) {

-                       echo "ERROR: deduplicate is only currently supported in postgresql 9.3";
-                       exit;
+                       fail("ERROR: deduplicate is only currently supported in postgresql 9.3");

                }
 
                 $oDB =& getDB();
                }
 
                 $oDB =& getDB();


@@ -281,7 +272,7 @@
                        if (PEAR::isError($aTokenSet))
                        {
                                var_dump($aTokenSet, $sSQL);
                        if (PEAR::isError($aTokenSet))
                        {
                                var_dump($aTokenSet, $sSQL);

-                               exit;
+                               exit(1);

                        }
 
                        $aKeep = array_shift($aTokenSet);
                        }
 
                        $aKeep = array_shift($aTokenSet);


@@ -297,7 +288,7 @@
                                if (PEAR::isError($x))
                                {
                                        var_dump($x);
                                if (PEAR::isError($x))
                                {
                                        var_dump($x);

-                                       exit;
+                                       exit(1);

                                }
 
                                $sSQL = "update search_name set";
                                }
 
                                $sSQL = "update search_name set";


@@ -307,7 +298,7 @@
                                if (PEAR::isError($x))
                                {
                                        var_dump($x);
                                if (PEAR::isError($x))
                                {
                                        var_dump($x);

-                                       exit;
+                                       exit(1);

                                }
 
                                $sSQL = "update location_area_country set";
                                }
 
                                $sSQL = "update location_area_country set";


@@ -317,7 +308,7 @@
                                if (PEAR::isError($x))
                                {
                                        var_dump($x);
                                if (PEAR::isError($x))
                                {
                                        var_dump($x);

-                                       exit;
+                                       exit(1);

                                }
 
                                foreach ($aPartitions as $sPartition)
                                }
 
                                foreach ($aPartitions as $sPartition)


@@ -329,7 +320,7 @@
                                        if (PEAR::isError($x))
                                        {
                                                var_dump($x);
                                        if (PEAR::isError($x))
                                        {
                                                var_dump($x);

-                                               exit;
+                                               exit(1);

                                        }
 
                                        $sSQL = "update location_area_country set";
                                        }
 
                                        $sSQL = "update location_area_country set";


@@ -339,7 +330,7 @@
                                        if (PEAR::isError($x))
                                        {
                                                var_dump($x);
                                        if (PEAR::isError($x))
                                        {
                                                var_dump($x);

-                                               exit;
+                                               exit(1);

                                        }
                                }
 
                                        }
                                }
 


@@ -348,7 +339,7 @@
                                if (PEAR::isError($x))
                                {
                                        var_dump($x);
                                if (PEAR::isError($x))
                                {
                                        var_dump($x);

-                                       exit;
+                                       exit(1);

                                }
                        }
 
                                }
                        }
 


@@ -357,6 +348,7 @@
 
        if ($aResult['index'])
        {
 
        if ($aResult['index'])
        {

+               if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;

                passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
        }
 
                passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
        }
 


@@ -364,8 +356,7 @@
        {
 
                if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {
        {
 
                if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {

-                       echo "Error: Update interval too low for download.geofabrik.de.  Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n";
-                       exit;
+                       fail("Error: Update interval too low for download.geofabrik.de.  Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n");

                }
 
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';
                }
 
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';


@@ -374,7 +365,7 @@
                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
                $sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
                $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
                $sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
                $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;

-               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
+               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];

                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }
                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }


@@ -459,7 +450,16 @@
                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
                        // Index file
                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
                        // Index file

-                       $sThisIndexCmd = $sCMDIndex;
+                       if (!isset($aResult['index-instances']))
+                       {
+                               if (getLoadAverage() < 24)
+                                       $iIndexInstances = 2;
+                               else
+                                       $iIndexInstances = 1;
+                       } else
+                               $iIndexInstances = $aResult['index-instances'];
+
+                       $sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;

                        $fCMDStartTime = time();
 
                        if (!$aResult['no-npi'])
                        $fCMDStartTime = time();
 
                        if (!$aResult['no-npi'])


@@ -527,7 +527,7 @@
 
                        $fDuration = time() - $fStartTime;
                        echo date('Y-m-d H:i:s')." Completed all for $sBatchEnd in ".round($fDuration/60,2)." minutes\n";
 
                        $fDuration = time() - $fStartTime;
                        echo date('Y-m-d H:i:s')." Completed all for $sBatchEnd in ".round($fDuration/60,2)." minutes\n";

-                       if (!$aResult['import-osmosis-all']) exit;
+                       if (!$aResult['import-osmosis-all']) exit(0);

 
                        if ( CONST_Replication_Update_Interval > 60 )
                        {
 
                        if ( CONST_Replication_Update_Interval > 60 )
                        {


@@ -549,7 +549,7 @@
                if (PEAR::isError($iNPIID))
                {
                        var_dump($iNPIID);
                if (PEAR::isError($iNPIID))
                {
                        var_dump($iNPIID);

-                       exit;
+                       exit(1);

                }
                $sConfigDirectory = CONST_BasePath.'/settings';
                $sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.$sBasePath.'/nominatim/partitionedtags.def -F ';
                }
                $sConfigDirectory = CONST_BasePath.'/settings';
                $sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.$sBasePath.'/nominatim/partitionedtags.def -F ';


@@ -580,8 +580,7 @@
                        exec($sCMDImport, $sJunk, $iErrorLevel);
                        if ($iErrorLevel)
                        {
                        exec($sCMDImport, $sJunk, $iErrorLevel);
                        if ($iErrorLevel)
                        {

-                               echo "Error: $iErrorLevel\n";
-                               exit;
+                               fail("Error: $iErrorLevel\n");

                        }
                        $sBatchEnd = $iNPIID;
                        echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
                        }
                        $sBatchEnd = $iNPIID;
                        echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";