fall back to debugInfo() for printing objects

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index a7f77e557c823eb1a42aed0284827793f936543d..501ad3f25227ab822beec5b173cab844515524c9 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -62,7 +62,10 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) {
 
 
 // by default, use all but one processor, but never more than 15.
-$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(min(16,getProcessorCount())-1);
+$iInstances = isset($aCMDResult['threads'])
+              ? $aCMDResult['threads']
+              : (min(16, getProcessorCount()) - 1);
+
 if ($iInstances < 1) {
     $iInstances = 1;
     warn("resetting threads to $iInstances");
@@ -596,6 +599,7 @@ if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
     $bDidSomething = true;
 
     $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
+    $sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
     $sTemplate = replace_tablespace(
         '{ts:address-index}',
         CONST_Tablespace_Address_Index,