Merge pull request #441 from mtmail/update-php-to-check-for-correct-js-file

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index f18556738b6c698438862136e0bedf859e661784..01402842e8bda9aa560a0709016ae07646c4f352 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -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 @@
 
                // re-run the functions
                echo "Functions\n";
-               create_sql_functions();
+               create_sql_functions($aCMDResult);
        }
 
        if ($aCMDResult['create-partition-tables'] || $aCMDResult['all'])
@@ -656,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";
@@ -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);