Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index edfc53c1e1c8c67f824f2918ba03f232e9244c34..f82696c215c6217d17237d05383158433c91bdd4 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
@@ -115,10 +114,10 @@
                {
                        // Import the file
                        $sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sNextFile;
-            if (!is_null(CONST_Osm2pgsql_Flatnode_File))
-            {
-                $sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
-            }
+                       if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+                       {
+                               $sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+                       }
                        echo $sCMD."\n";
                        exec($sCMD, $sJunk, $iErrorLevel);
 
@@ -230,10 +229,10 @@
 
                // import generated change file
                $sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sTemporaryFile;
-        if (!is_null(CONST_Osm2pgsql_Flatnode_File))
-        {
-            $sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
-        }
+               if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+               {
+                       $sCMD .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+               }
                echo $sCMD."\n";
                exec($sCMD, $sJunk, $iErrorLevel);
                if ($iErrorLevel)
@@ -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']);
        }
 
@@ -363,11 +363,11 @@
                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
                $sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
                $sCMDImport = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sImportFile;
-        if (!is_null(CONST_Osm2pgsql_Flatnode_File))
-        {
-            $sCMDImport .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
-        }
-               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$aResult['index-instances'];
+               if (!is_null(CONST_Osm2pgsql_Flatnode_File))
+               {
+                       $sCMDImport .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+               }
+               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'];
                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }
@@ -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'])
                        {