Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / admin / update.php

diff --git a/lib-php/admin/update.php b/lib-php/admin/update.php
index fba5300b07ee4ec0d5791d01895bfe16eb1310e3..fae4a783c6bebfdf8cd1560cf5fb2a541ee9770f 100644 (file)
--- a/lib-php/admin/update.php
+++ b/lib-php/admin/update.php
@@ -52,6 +52,7 @@ loadSettings($aCMDResult['project-dir'] ?? getcwd());
 setupHTTPProxy();
 
 if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 setupHTTPProxy();
 
 if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;

+

 if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
 
 date_default_timezone_set('Etc/UTC');
 if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
 
 date_default_timezone_set('Etc/UTC');


@@ -104,11 +105,17 @@ if ($fPostgresVersion >= 11.0) {
 }
 
 $oNominatimCmd = new \Nominatim\Shell(getSetting('NOMINATIM_TOOL'));
 }
 
 $oNominatimCmd = new \Nominatim\Shell(getSetting('NOMINATIM_TOOL'));

-if ($aResult['quiet']) {
-    $oNominatimCmd->addParams('--quiet');
-}
-if ($aResult['verbose']) {
-    $oNominatimCmd->addParams('--verbose');
+
+function run($oCmd)
+{
+    global $aCMDResult;
+    if ($aCMDResult['quiet'] ?? false) {
+        $oCmd->addParams('--quiet');
+    }
+    if ($aCMDResult['verbose'] ?? false) {
+        $oCmd->addParams('--verbose');
+    }
+    $oCmd->run(true);

 }
 
 
 }
 
 


@@ -119,7 +126,7 @@ if ($aResult['init-updates']) {
         $oCmd->addParams('--no-update-functions');
     }
 
         $oCmd->addParams('--no-update-functions');
     }
 

-    $oCmd->run();
+    run($oCmd);

 }
 
 if ($aResult['check-for-updates']) {
 }
 
 if ($aResult['check-for-updates']) {


@@ -147,7 +154,7 @@ if (isset($aResult['import-diff']) || isset($aResult['import-file'])) {
 }
 
 if ($aResult['calculate-postcodes']) {
 }
 
 if ($aResult['calculate-postcodes']) {

-    (clone($oNominatimCmd))->addParams('refresh', '--postcodes')->run();
+    run((clone($oNominatimCmd))->addParams('refresh', '--postcodes'));

 }
 
 $sTemporaryFile = CONST_InstallDir.'/osmosischange.osc';
 }
 
 $sTemporaryFile = CONST_InstallDir.'/osmosischange.osc';


@@ -196,35 +203,21 @@ if ($bHaveDiff) {
 }
 
 if ($aResult['recompute-word-counts']) {
 }
 
 if ($aResult['recompute-word-counts']) {

-    (clone($oNominatimCmd))->addParams('refresh', '--word-counts')->run();
+    run((clone($oNominatimCmd))->addParams('refresh', '--word-counts'));

 }
 
 if ($aResult['index']) {
 }
 
 if ($aResult['index']) {

-    (clone $oNominatimCmd)
+    run((clone $oNominatimCmd)

         ->addParams('index', '--minrank', $aResult['index-rank'])
         ->addParams('index', '--minrank', $aResult['index-rank'])

-        ->addParams('--threads', $aResult['index-instances'])
-        ->run();
+        ->addParams('--threads', $aResult['index-instances']));

 }
 
 if ($aResult['update-address-levels']) {
 }
 
 if ($aResult['update-address-levels']) {

-    (clone($oNominatimCmd))->addParams('refresh', '--address-levels')->run();
+    run((clone($oNominatimCmd))->addParams('refresh', '--address-levels'));

 }
 
 if ($aResult['recompute-importance']) {
 }
 
 if ($aResult['recompute-importance']) {

-    echo "Updating importance values for database.\n";
-    $oDB = new Nominatim\DB();
-    $oDB->connect();
-
-    $sSQL = 'ALTER TABLE placex DISABLE TRIGGER ALL;';
-    $sSQL .= 'UPDATE placex SET (wikipedia, importance) =';
-    $sSQL .= '   (SELECT wikipedia, importance';
-    $sSQL .= '    FROM compute_importance(extratags, country_code, osm_type, osm_id));';
-    $sSQL .= 'UPDATE placex s SET wikipedia = d.wikipedia, importance = d.importance';
-    $sSQL .= ' FROM placex d';
-    $sSQL .= ' WHERE s.place_id = d.linked_place_id and d.wikipedia is not null';
-    $sSQL .= '       and (s.wikipedia is null or s.importance < d.importance);';
-    $sSQL .= 'ALTER TABLE placex ENABLE TRIGGER ALL;';
-    $oDB->exec($sSQL);
+    run((clone($oNominatimCmd))->addParams('refresh', '--importance'));

 }
 
 if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
 }
 
 if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {


@@ -240,5 +233,5 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
         $oCmd->addParams('--no-index');
     }
 
         $oCmd->addParams('--no-index');
     }
 

-    exit($oCmd->run());
+    run($oCmd);

 }
 }