From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 2 Jul 2018 19:33:27 +0000 (+0200)
Subject: Merge branch 'better-reverse' of https://github.com/gemo1011/Nominatim into gemo1011... 
X-Git-Tag: v3.2.0~60
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ac29f8bc91ec69cf6695ffc8118292b1cccce1e4?hp=-c

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

ac29f8bc91ec69cf6695ffc8118292b1cccce1e4
diff --combined utils/setup.php
index a7f77e55,4925a4e5..e2810737
--- a/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,