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

remove unused location_property_-partion- tables

diff --combined utils/setup.php
index 5a6366e70ccfbd5de3cfa8cf763ba7ac7fccf813,f18556738b6c698438862136e0bedf859e661784..4a20d5dc5df570286cc18f82b670ec0986337ad2
--- 1/utils/setup.php
--- 2/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);