update.php was checking for static file which is no longer part of the project

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 5a6366e70ccfbd5de3cfa8cf763ba7ac7fccf813..01402842e8bda9aa560a0709016ae07646c4f352 100755 (executable)
--- 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);
        }
@@ -674,7 +656,7 @@
                @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
                echo "Symlinks created\n";
 
-               $sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/tiles.js');
+               $sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/nominatim-ui.js');
                if (!$sTestFile)
                {
                        echo "\nWARNING: Unable to access the website at ".CONST_Website_BaseURL."\n";