fix scene making scripts and add building-parallel-road scene

[nominatim.git] / utils / specialphrases.php

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 13480695d5b806b69c6c9861b58e3991e208f20d..189a7a3e00fef086a0d002dc69665e6a58c380c3 100755 (executable)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -1,9 +1,10 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
-        ini_set('display_errors', 'stderr');
+       require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+       require_once(CONST_BasePath.'/lib/init-cmd.php');
+       ini_set('memory_limit', '800M');
+       ini_set('display_errors', 'stderr');
 
         $aCMDOptions = array(
                 "Import and export special phrases",
@@ -15,7 +16,7 @@
         );
         getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
-               include(CONST_BasePath.'/settings/phrase_settings.php');
+               include(CONST_InstallPath.'/settings/phrase_settings.php');
 
 
     if ($aCMDResult['countries']) {
@@ -105,7 +106,7 @@
                                echo " tablespace ".CONST_Tablespace_Aux_Index;
                        echo ";\n";
 
-            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." TO \"www-data\";\n";
+            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]).' TO "'.CONST_Database_Web_User."\";\n";
 
                }