Merge pull request #2115 from lonvia/use-dotenv

[nominatim.git] / lib / setup_functions.php

diff --git a/lib/setup_functions.php b/lib/setup_functions.php
index 43f30a090dfff4939f4f511e786e2615d467c1c1..a2287d9bf794fc19bfa5a9140324ec581896f24b 100755 (executable)
--- a/lib/setup_functions.php
+++ b/lib/setup_functions.php
@@ -15,17 +15,23 @@ 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');
+    if (!$sBinary) {
+        $sBinary = CONST_InstallDir.'/osm2pgsql/osm2pgsql';
+    }
+
+    return $sBinary;
+}
 
-    $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);';
+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;
 }