X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/49ac49228ee208f7b219ee8ea8e1b199d6486245..91129b37f605a06f85bc8aa07eede84fb16ad644:/utils/update.php

diff --git a/utils/update.php b/utils/update.php
index ad627482..f7f20aa3 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -37,12 +37,7 @@ $aCMDOptions
   );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 
-if (!isset($aResult['index-instances'])) {
-    if (getLoadAverage() < 24)
-        $aResult['index-instances'] = 2;
-    else
-        $aResult['index-instances'] = 1;
-}
+if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 
 if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
 
@@ -78,7 +73,7 @@ if ($aResult['init-updates']) {
 
     // get the appropriate state id
     $aOutput = 0;
-    exec(CONST_Pyosmium_Get_Changes.' -D '.$sWindBack.' --server '.CONST_Replication_Url,
+    exec(CONST_Pyosmium_Binary.' -D '.$sWindBack.' --server '.CONST_Replication_Url,
         $aOutput, $iRet);
     if ($iRet != 0) {
         fail('Error running pyosmium tools');
@@ -238,7 +233,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
     }
 
     $sImportFile = CONST_InstallPath.'/osmosischange.osc';
-    $sCMDDownload = CONST_Pyosmium_Get_Changes.' --server '.CONST_Replication_Url.' -o '.$sImportFile.' -s '.CONST_Replication_Max_Diff_size;
+    $sCMDDownload = CONST_Pyosmium_Binary.' --server '.CONST_Replication_Url.' -o '.$sImportFile.' -s '.CONST_Replication_Max_Diff_size;
     $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
     $sCMDIndex = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
 
@@ -268,12 +263,12 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
             }
 
             // Download the next batch of changes.
-            unlink($sImportFile);
             do {
                 $fCMDStartTime = time();
-                $iNextSeq = (int) $aLastState['sequence_id'] + 1;
+                $iNextSeq = (int) $aLastState['sequence_id'];
                 unset($aOutput);
                 echo "$sCMDDownload -I $iNextSeq\n";
+                unlink($sImportFile);
                 exec($sCMDDownload.' -I '.$iNextSeq, $aOutput, $iResult);
 
                 if ($iResult == 3) {