Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / setup_functions.php

diff --git a/lib/setup_functions.php b/lib/setup_functions.php
index 43f30a090dfff4939f4f511e786e2615d467c1c1..dc84cf92852df0a98765cad45f2adfd39d261571 100755 (executable)
--- a/lib/setup_functions.php
+++ b/lib/setup_functions.php
@@ -15,17 +15,20 @@ function checkInFile($sOSMFile)
     }
 }
 
-function checkModulePresence()
+function getOsm2pgsqlBinary()
 {
-    // Try accessing the C module, so we know early if something is wrong.
-    // Raises Nominatim\DatabaseError on failure
+    $sBinary = getSetting('OSM2PGSQL_BINARY');
 
-    $sModulePath = CONST_Database_Module_Path;
-    $sSQL = "CREATE FUNCTION nominatim_test_import_func(text) RETURNS text AS '";
-    $sSQL .= $sModulePath . "/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT";
-    $sSQL .= ';DROP FUNCTION nominatim_test_import_func(text);';
+    return $sBinary ? $sBinary : CONST_Default_Osm2pgsql;
+}
+
+function getImportStyle()
+{
+    $sStyle = getSetting('IMPORT_STYLE');
+
+    if (in_array($sStyle, array('admin', 'street', 'address', 'full', 'extratags'))) {
+        return CONST_DataDir.'/settings/import-'.$sStyle.'.style';
+    }
 
-    $oDB = new \Nominatim\DB();
-    $oDB->connect();
-    $oDB->exec($sSQL, null, 'Database server failed to load '.$sModulePath.'/nominatim.so module');
+    return $sStyle;
 }