Merge pull request #550 from lonvia/decrease-line-length

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index da16e3f091864283a3d089583153263e7e6d607e..d08f3bd780af824849b2991acaa7e5cda25837d2 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -163,7 +163,8 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) {
 
     $osm2pgsql = CONST_Osm2pgsql_Binary;
     if (!file_exists($osm2pgsql)) {
-        echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
+        echo "Check CONST_Osm2pgsql_Binary in your local settings file.\n";
+        echo "Normally you should not need to set this manually.\n";
         fail("osm2pgsql not found in '$osm2pgsql'");
     }
 
@@ -345,7 +346,11 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) {
     }
 
     // used by getorcreate_word_id to ignore frequent partial words
-    if (!pg_query($oDB->connection, 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS $$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE')) fail(pg_last_error($oDB->connection));
+    $sSQL = 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS ';
+    $sSQL .= '$$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE';
+    if (!pg_query($oDB->connection, $sSQL)) {
+        fail(pg_last_error($oDB->connection));
+    }
     echo ".\n";
 
     // pre-create the word list