allow reverse search order by default

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index d1ded5adb203df0d7031210b241322fac5185d8d..febe06820bceb39cd2846d3df8ae6939b6622a79 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -46,7 +46,6 @@
                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
@@ -352,6 +351,7 @@
 
        if ($aResult['index'])
        {
+               if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
                passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
        }
 
@@ -367,7 +367,7 @@
                {
                        $sCMDImport .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
                }
-               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'];
+               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }
@@ -391,7 +391,7 @@
 
                                                unset($aReplicationLag);
                                                exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
-                                               while ($iErrorLevel == 1 || $aReplicationLag[0] < 1)
+                                               while ($iErrorLevel > 0 || $aReplicationLag[0] < 1)
                                                {
                                                        if ($iErrorLevel)
                                                        {
@@ -412,7 +412,7 @@
                                        $fCMDStartTime = time();
                                        echo $sCMDDownload."\n";
                                        exec($sCMDDownload, $sJunk, $iErrorLevel);
-                                       while ($iErrorLevel == 1)
+                                       while ($iErrorLevel > 0)
                                        {
                                                echo "Error: $iErrorLevel\n";
                                                sleep(60);
@@ -450,7 +450,16 @@
                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
                        // Index file
-                       $sThisIndexCmd = $sCMDIndex;
+                       if (!isset($aResult['index-instances']))
+                       {
+                               if (getLoadAverage() < 15)
+                                       $iIndexInstances = 2;
+                               else
+                                       $iIndexInstances = 1;
+                       } else
+                               $iIndexInstances = $aResult['index-instances'];
+
+                       $sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
 
                        if (!$aResult['no-npi'])
                        {