prot load-data function to python

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

diff --git a/lib-php/admin/setup.php b/lib-php/admin/setup.php
index 91b72c15f844298d57726c5e429b3cab9d20f86b..6493460d305695c3a5a49246c5e7d67e25c6d5fc 100644 (file)
--- a/lib-php/admin/setup.php
+++ b/lib-php/admin/setup.php
@@ -64,6 +64,15 @@ if ($aCMDResult['verbose']) {
     $oNominatimCmd->addParams('--verbose');
 }
 
     $oNominatimCmd->addParams('--verbose');
 }
 

+// by default, use all but one processor, but never more than 15.
+$iInstances = max(1, $aCMDResult['threads'] ?? (min(16, getProcessorCount()) - 1));
+
+function run($oCmd) {
+    global $iInstances;
+    $oCmd->addParams('--threads', $iInstances);
+    $oCmd->run(true);
+}
+

 
 //*******************************************************
 // Making some sanity check:
 
 //*******************************************************
 // Making some sanity check:


@@ -81,7 +90,7 @@ $oSetup = new SetupFunctions($aCMDResult);
 // go through complete process if 'all' is selected or start selected functions
 if ($aCMDResult['create-db'] || $aCMDResult['all']) {
     $bDidSomething = true;
 // go through complete process if 'all' is selected or start selected functions
 if ($aCMDResult['create-db'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    (clone($oNominatimCmd))->addParams('transition', '--create-db')->run(true);
+    run((clone($oNominatimCmd))->addParams('transition', '--create-db'));

 }
 
 if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
 }
 
 if ($aCMDResult['setup-db'] || $aCMDResult['all']) {


@@ -92,7 +101,7 @@ if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
         $oCmd->addParams('--no-partitions');
     }
 
         $oCmd->addParams('--no-partitions');
     }
 

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

 }
 
 if ($aCMDResult['import-data'] || $aCMDResult['all']) {
 }
 
 if ($aCMDResult['import-data'] || $aCMDResult['all']) {


@@ -104,7 +113,7 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) {
         $oCmd->addParams('--drop');
     }
 
         $oCmd->addParams('--drop');
     }
 

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

 }
 
 if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
 }
 
 if ($aCMDResult['create-functions'] || $aCMDResult['all']) {


@@ -126,17 +135,18 @@ if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) {
 
 if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {
     $bDidSomething = true;
 
 if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    $oSetup->createPartitionFunctions();
+    $oSetup->createFunctions(); // also create partition functions

 }
 
 if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {
     $bDidSomething = true;

+    // ignore errors!

     (clone($oNominatimCmd))->addParams('refresh', '--wiki-data')->run();
 }
 
 if ($aCMDResult['load-data'] || $aCMDResult['all']) {
     $bDidSomething = true;
     (clone($oNominatimCmd))->addParams('refresh', '--wiki-data')->run();
 }
 
 if ($aCMDResult['load-data'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    $oSetup->loadData($aCMDResult['disable-token-precalc']);
+    run((clone($oNominatimCmd))->addParams('transition', '--load-data'));

 }
 
 if ($aCMDResult['import-tiger-data']) {
 }
 
 if ($aCMDResult['import-tiger-data']) {


@@ -152,12 +162,17 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
 
 if ($aCMDResult['index'] || $aCMDResult['all']) {
     $bDidSomething = true;
 
 if ($aCMDResult['index'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    $oSetup->index($aCMDResult['index-noanalyse']);
+    $oCmd = (clone($oNominatimCmd))->addParams('transition', '--index');
+    if ($aCMDResult['index-noanalyse'] ?? false) {
+        $oCmd->addParams('--no-analyse');
+    }
+
+    run($oCmd);

 }
 
 if ($aCMDResult['drop']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['drop']) {
     $bDidSomething = true;

-    (clone($oNominatimCmd))->addParams('freeze')->run(true);
+    run((clone($oNominatimCmd))->addParams('freeze'));

 }
 
 if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
 }
 
 if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {


@@ -172,7 +187,7 @@ if ($aCMDResult['create-country-names'] || $aCMDResult['all']) {
 
 if ($aCMDResult['setup-website'] || $aCMDResult['all']) {
     $bDidSomething = true;
 
 if ($aCMDResult['setup-website'] || $aCMDResult['all']) {
     $bDidSomething = true;

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

 }
 
 // ******************************************************
 }
 
 // ******************************************************