X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3546b304739f2b214667ec0127ae7762be4cd5d5..6a3c6c43ea7133c934834ce1face9212f4e3d239:/lib/cmd.php

diff --git a/lib/cmd.php b/lib/cmd.php
index d7ba285d..a1084938 100644
--- a/lib/cmd.php
+++ b/lib/cmd.php
@@ -99,7 +99,7 @@ function showUsage($aSpec, $bExit = false, $sError = false)
         echo 'Try `'.basename($_SERVER['argv'][0]).' --help` for more information.'."\n";
         exit;
     }
-    echo "Usage: ".basename($_SERVER['argv'][0])."\n";
+    echo 'Usage: '.basename($_SERVER['argv'][0])."\n";
     $bFirst = true;
     foreach ($aSpec as $aLine) {
         if (is_array($aLine)) {
@@ -136,15 +136,53 @@ function info($sMsg)
 
 $aWarnings = [];
 
+
 function warn($sMsg)
 {
     $GLOBALS['aWarnings'][] = $sMsg;
     echo date('Y-m-d H:i:s == ').'WARNING: '.$sMsg."\n";
 }
 
+
 function repeatWarnings()
 {
     foreach ($GLOBALS['aWarnings'] as $sMsg) {
         echo '  * ',$sMsg."\n";
     }
 }
+
+
+function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreErrors = false)
+{
+    // Convert database DSN to psql parameters
+    $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
+    if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
+    $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
+    if (!$bVerbose) {
+        $sCMD .= ' -q';
+    }
+    if ($bfatal && !$bIgnoreErrors) {
+        $sCMD .= ' -v ON_ERROR_STOP=1';
+    }
+    $aDescriptors = array(
+                     0 => array('pipe', 'r'),
+                     1 => STDOUT,
+                     2 => STDERR
+                    );
+    $ahPipes = null;
+    $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes);
+    if (!is_resource($hProcess)) {
+        fail('unable to start pgsql');
+    }
+
+    while (strlen($sScript)) {
+        $written = fwrite($ahPipes[0], $sScript);
+        if ($written <= 0) break;
+        $sScript = substr($sScript, $written);
+    }
+    fclose($ahPipes[0]);
+    $iReturn = proc_close($hProcess);
+    if ($bfatal && $iReturn > 0) {
+        fail("pgsql returned with error code ($iReturn)");
+    }
+}