Merge branch 'better-reverse' of https://github.com/gemo1011/Nominatim into gemo1011...

diff --combined utils/setup.php
index a7f77e557c823eb1a42aed0284827793f936543d,4925a4e5b0bef4a30d5a859b17d25535fa487be2..e2810737f6f2bb46da2ca46e98c345afdaa8c418
--- 1/utils/setup.php
--- 2/utils/setup.php
+++ b/utils/setup.php
@@@ -61,8 -61,8 +61,8 @@@ if ($aCMDResult['import-data'] || $aCMD
  }
  
  
 -// This is a pretty hard core default - the number of processors in the box - 1
 -$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(getProcessorCount()-1);
 +// by default, use all but one processor, but never more than 15.
 +$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(min(16,getProcessorCount())-1);
  if ($iInstances < 1) {
      $iInstances = 1;
      warn("resetting threads to $iInstances");
@@@ -596,6 -596,7 +596,7 @@@ if ($aCMDResult['create-search-indices'
      $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,