X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b4f0b8b72834d13f093672c144507d589fdd87f8..a32f6c66b8c4c5c985f3ae71577404d76716d6e6:/utils/setup.php diff --git a/utils/setup.php b/utils/setup.php index 4a2bc64f..f1855673 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -621,14 +621,6 @@ { echo "Search indices\n"; $bDidSomething = true; - $oDB =& getDB(); - $sSQL = 'select distinct partition from country_name'; - $aPartitions = $oDB->getCol($sSQL); - if (PEAR::isError($aPartitions)) - { - fail($aPartitions->getMessage()); - } - if (!$aCMDResult['no-partitions']) $aPartitions[] = 0; $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql'); $sTemplate = replace_tablespace('{ts:address-index}', @@ -637,16 +629,6 @@ CONST_Tablespace_Search_Index, $sTemplate); $sTemplate = replace_tablespace('{ts:aux-index}', CONST_Tablespace_Aux_Index, $sTemplate); - preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER); - foreach($aMatches as $aMatch) - { - $sResult = ''; - foreach($aPartitions as $sPartitionName) - { - $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]); - } - $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate); - } pgsqlRunScript($sTemplate); }