hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-15 19:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix verbose flag for PHP wrapper scripts

Browse Source 
The flag must come after the command.
This commit is contained in:
Sarah Hoffmann
2021-02-26 16:33:30 +01:00
parent dd03aeb966
commit c7f40e3cee
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib-php/admin/setup.php
View File

@@ -57,23 +57,24 @@ setupHTTPProxy();
$bDidSomething = false;
$oNominatimCmd = new \Nominatim\Shell(getSetting('NOMINATIM_TOOL'));
if (isset($aCMDResult['quiet']) && $aCMDResult['quiet']) {
$oNominatimCmd->addParams('--quiet');
}
if ($aCMDResult['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) {
function run($oCmd)
{
global $iInstances;
global $aCMDResult;
$oCmd->addParams('--threads', $iInstances);
if ($aCMDResult['ignore-errors'] ?? false) {
$oCmd->addParams('--ignore-errors');
}
if ($aCMDResult['quiet'] ?? false) {
$oCmd->addParams('--quiet');
}
if ($aCMDResult['verbose'] ?? false) {
$oCmd->addParams('--verbose');
}
$oCmd->run(true);
}