remove old nominatim.py in favour of 'nominatim index'

[nominatim.git] / lib / setup_functions.php

diff --git a/lib/setup_functions.php b/lib/setup_functions.php
index 89736ae0515c53039403014a3180e9413e09e18d..dc84cf92852df0a98765cad45f2adfd39d261571 100755 (executable)
--- a/lib/setup_functions.php
+++ b/lib/setup_functions.php
@@ -15,26 +15,20 @@ function checkInFile($sOSMFile)
     }
 }
 
-function checkModulePresence()
+function getOsm2pgsqlBinary()
 {
-    // Try accessing the C module, so we know early if something is wrong
-    // and can simply error out.
-    $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);';
-
-    $oDB = new \Nominatim\DB();
-    $oDB->connect();
-
-    $bResult = true;
-    try {
-        $oDB->exec($sSQL);
-    } catch (\Nominatim\DatabaseError $e) {
-        echo "\nERROR: Failed to load nominatim module. Reason:\n";
-        echo $oDB->getLastError()[2] . "\n\n";
-        $bResult = false;
+    $sBinary = getSetting('OSM2PGSQL_BINARY');
+
+    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';
     }
 
-    return $bResult;
+    return $sStyle;
 }