replace database abstraction DB with PDO

[nominatim.git] / lib / setup_functions.php

diff --git a/lib/setup_functions.php b/lib/setup_functions.php
index da66fc7d89813b509c36c7dcce3f479deef540bf..89736ae0515c53039403014a3180e9413e09e18d 100755 (executable)
--- a/lib/setup_functions.php
+++ b/lib/setup_functions.php
@@ -1,77 +1,40 @@
-<?php\r
-\r
-function checkInFile($sOSMFile) {\r
-    if (!isset($sOSMFile)) {\r
-        fail('missing --osm-file for data import');\r
-    }\r
-\r
-    if (!file_exists($sOSMFile)) {\r
-        fail('the path supplied to --osm-file does not exist');\r
-    }\r
-\r
-    if (!is_readable($sOSMFile)) {\r
-        fail('osm-file "'.$aCMDResult['osm-file'].'" not readable');\r
-    }\r
-}\r
-\r
-function checkModulePresence() {\r
-    // Try accessing the C module, so we know early if something is wrong\r
-    // and can simply error out.\r
-    $sModulePath = CONST_Database_Module_Path;\r
-    $sSQL = "CREATE FUNCTION nominatim_test_import_func(text) RETURNS text AS '";\r
-    $sSQL .= $sModulePath."/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT";\r
-    $sSQL .= ';DROP FUNCTION nominatim_test_import_func(text);';\r
-\r
-    $oDB =& getDB();\r
-    $oResult = $oDB->query($sSQL);\r
-\r
-    $bResult = true;\r
-\r
-    if (PEAR::isError($oResult)) {\r
-        echo "\nERROR: Failed to load nominatim module. Reason:\n";\r
-        echo $oResult->userinfo."\n\n";\r
-        $bResult = false;\r
-    }\r
-\r
-    return $bResult;\r
-}\r
-\r
-function createSetupArgvArray() {\r
-    $aCMDOptions\r
-    = array(\r
-    'Create and setup nominatim search system',\r
-    array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),\r
-    array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),\r
-    array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),\r
-\r
-    array('osm-file', '', 0, 1, 1, 1, 'realpath', 'File to import'),\r
-    array('threads', '', 0, 1, 1, 1, 'int', 'Number of threads (where possible)'),\r
-\r
-    array('all', '', 0, 1, 0, 0, 'bool', 'Do the complete process'),\r
-\r
-    array('create-db', '', 0, 1, 0, 0, 'bool', 'Create nominatim db'),\r
-    array('setup-db', '', 0, 1, 0, 0, 'bool', 'Build a blank nominatim db'),\r
-    array('import-data', '', 0, 1, 0, 0, 'bool', 'Import a osm file'),\r
-    array('osm2pgsql-cache', '', 0, 1, 1, 1, 'int', 'Cache size used by osm2pgsql'),\r
-    array('create-functions', '', 0, 1, 0, 0, 'bool', 'Create functions'),\r
-    array('enable-diff-updates', '', 0, 1, 0, 0, 'bool', 'Turn on the code required to make diff updates work'),\r
-    array('enable-debug-statements', '', 0, 1, 0, 0, 'bool', 'Include debug warning statements in pgsql commands'),\r
-    array('ignore-errors', '', 0, 1, 0, 0, 'bool', 'Continue import even when errors in SQL are present (EXPERT)'),\r
-    array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),\r
-    array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'),\r
-    array('create-partition-functions', '', 0, 1, 0, 0, 'bool', 'Create required partition triggers'),\r
-    array('no-partitions', '', 0, 1, 0, 0, 'bool', 'Do not partition search indices (speeds up import of single country extracts)'),\r
-    array('import-wikipedia-articles', '', 0, 1, 0, 0, 'bool', 'Import wikipedia article dump'),\r
-    array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),\r
-    array('disable-token-precalc', '', 0, 1, 0, 0, 'bool', 'Disable name precalculation (EXPERT)'),\r
-    array('import-tiger-data', '', 0, 1, 0, 0, 'bool', 'Import tiger data (not included in \'all\')'),\r
-    array('calculate-postcodes', '', 0, 1, 0, 0, 'bool', 'Calculate postcode centroids'),\r
-    array('osmosis-init', '', 0, 1, 0, 0, 'bool', 'Generate default osmosis configuration'),\r
-    array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),\r
-    array('index-noanalyse', '', 0, 1, 0, 0, 'bool', 'Do not perform analyse operations during index (EXPERT)'),\r
-    array('create-search-indices', '', 0, 1, 0, 0, 'bool', 'Create additional indices required for search and update'),\r
-    array('create-country-names', '', 0, 1, 0, 0, 'bool', 'Create default list of searchable country names'),\r
-    array('drop', '', 0, 1, 0, 0, 'bool', 'Drop tables needed for updates, making the database readonly (EXPERIMENTAL)'),\r
-    );\r
-    return $aCMDOptions;\r
-}\r
+<?php
+
+function checkInFile($sOSMFile)
+{
+    if (!isset($sOSMFile)) {
+        fail('missing --osm-file for data import');
+    }
+
+    if (!file_exists($sOSMFile)) {
+        fail('the path supplied to --osm-file does not exist');
+    }
+
+    if (!is_readable($sOSMFile)) {
+        fail('osm-file "' . $aCMDResult['osm-file'] . '" not readable');
+    }
+}
+
+function checkModulePresence()
+{
+    // 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;
+    }
+
+    return $bResult;
+}