X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/09935d41484d5e9ec450bb16170785849029f3da..88eaa8430b8ceb1696af50c603561a451353ed2a:/lib/cmd.php diff --git a/lib/cmd.php b/lib/cmd.php index 44923618..32fdc857 100644 --- a/lib/cmd.php +++ b/lib/cmd.php @@ -120,15 +120,6 @@ function showUsage($aSpec, $bExit = false, $sError = false) exit; } -function chksql($oSql, $sMsg = false) -{ - if (PEAR::isError($oSql)) { - fail($sMsg || $oSql->getMessage(), $oSql->userinfo); - } - - return $oSql; -} - function info($sMsg) { echo date('Y-m-d H:i:s == ').$sMsg."\n"; @@ -155,7 +146,7 @@ function repeatWarnings() function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreErrors = false) { // Convert database DSN to psql parameters - $aDSNInfo = DB::parseDSN(CONST_Database_DSN); + $aDSNInfo = \Nominatim\DB::parseDSN(CONST_Database_DSN); if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database']; if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {