X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c1beefd543974541f265d0f8df3a402d0e7a23e5..ec8963f3d2e18a197aee8576889400fb058150d3:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index b71e07e0..95eda0f4 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -16,7 +16,6 @@ $aCMDOptions
 
    array('osm-file', '', 0, 1, 1, 1, 'realpath', 'File to import'),
    array('threads', '', 0, 1, 1, 1, 'int', 'Number of threads (where possible)'),
-   array('module-path', '', 0, 1, 1, 1, 'string', 'Directory on Postgres server containing Nominatim module'),
 
    array('all', '', 0, 1, 0, 0, 'bool', 'Do the complete process'),
 
@@ -80,11 +79,8 @@ if (isset($aCMDResult['osm2pgsql-cache'])) {
     $iCacheMemory = getCacheMemoryMB();
 }
 
-$sModulePath = CONST_InstallPath . '/module';
-if (isset($aCMDResult['module-path'])) {
-    $sModulePath = $aCMDResult['module-path'];
-    echo 'module path: ' . $sModulePath . '\n';
-}
+$sModulePath = CONST_Database_Module_Path;
+info('module path: ' . $sModulePath);
 
 $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
 if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
@@ -950,9 +946,12 @@ function checkModulePresence()
 {
     // Try accessing the C module, so we know early if something is wrong
     // and can simply error out.
+    global $sModulePath;
     $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 =& getDB();
     $oResult = $oDB->query($sSQL);
 
     $bResult = true;