From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 24 Apr 2016 14:05:10 +0000 (+0200)
Subject: Merge pull request #436 from lonvia/remove-location-property-tables
X-Git-Tag: v3.0.0~176
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/131527bdab6738baff679171c421ea7fa863e100?hp=-c

Merge pull request #436 from lonvia/remove-location-property-tables

remove unused location_property_-partion- tables
---

131527bdab6738baff679171c421ea7fa863e100
diff --combined utils/setup.php
index 5a6366e7,f1855673..4a20d5dc
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -217,7 -217,7 +217,7 @@@
  		echo "Functions\n";
  		$bDidSomething = true;
  		if (!file_exists(CONST_InstallPath.'/module/nominatim.so')) fail("nominatim module not built");
 -		create_sql_functions();
 +		create_sql_functions($aCMDResult);
  	}
  
  	if ($aCMDResult['create-tables'] || $aCMDResult['all'])
@@@ -243,7 -243,7 +243,7 @@@
  
  		// re-run the functions
  		echo "Functions\n";
 -		create_sql_functions();
 +		create_sql_functions($aCMDResult);
  	}
  
  	if ($aCMDResult['create-partition-tables'] || $aCMDResult['all'])
@@@ -621,14 -621,6 +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 +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);
  	}
@@@ -918,7 -900,7 +900,7 @@@
  		return $sSql;
  	}
  
 -	function create_sql_functions()
 +	function create_sql_functions($aCMDResult)
  	{
  		$sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
  		$sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate);