X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1108bf7d8679b85b7aa9f829019acf4dc8210dd3..0aa2ca64d2d7492b05f2e541764fbe159eb5a187:/lib/cmd.php?ds=sidebyside diff --git a/lib/cmd.php b/lib/cmd.php index 2fd3c49b..72b66608 100644 --- a/lib/cmd.php +++ b/lib/cmd.php @@ -1,5 +1,6 @@ getMessage(), $oSql->userinfo); - } - - return $oSql; -} - function info($sMsg) { echo date('Y-m-d H:i:s == ').$sMsg."\n"; @@ -155,40 +147,47 @@ 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']; + + $oCmd = new \Nominatim\Shell('psql'); + $oCmd->addParams('--port', $aDSNInfo['port']); + $oCmd->addParams('--dbname', $aDSNInfo['database']); if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { - $sCMD .= ' -h ' . $aDSNInfo['hostspec']; + $oCmd->addParams('--host', $aDSNInfo['hostspec']); } if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { - $sCMD .= ' -U ' . $aDSNInfo['username']; + $oCmd->addParams('--username', $aDSNInfo['username']); } - $procenv = null; - if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { - $procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); + if (isset($aDSNInfo['password'])) { + $oCmd->addEnvPair('PGPASSWORD', $aDSNInfo['password']); } if (!$bVerbose) { - $sCMD .= ' -q'; + $oCmd->addParams('--quiet'); } if ($bfatal && !$bIgnoreErrors) { - $sCMD .= ' -v ON_ERROR_STOP=1'; + $oCmd->addParams('-v', 'ON_ERROR_STOP=1'); } + $aDescriptors = array( 0 => array('pipe', 'r'), 1 => STDOUT, 2 => STDERR ); $ahPipes = null; - $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes, null, $procenv); + $hProcess = @proc_open($oCmd->escapedCmd(), $aDescriptors, $ahPipes, null, $oCmd->aEnv); if (!is_resource($hProcess)) { fail('unable to start pgsql'); } + if (!$bVerbose) { + fwrite($ahPipes[0], 'set client_min_messages to WARNING;'); + } + while (strlen($sScript)) { - $written = fwrite($ahPipes[0], $sScript); - if ($written <= 0) break; - $sScript = substr($sScript, $written); + $iWritten = fwrite($ahPipes[0], $sScript); + if ($iWritten <= 0) break; + $sScript = substr($sScript, $iWritten); } fclose($ahPipes[0]); $iReturn = proc_close($hProcess); @@ -196,21 +195,3 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError fail("pgsql returned with error code ($iReturn)"); } } - - -function runWithEnv($cmd, $env) -{ - $fds = array(0 => array('pipe', 'r'), - 1 => STDOUT, - 2 => STDERR); - $pipes = null; - $proc = @proc_open($cmd, $fds, $pipes, null, $env); - if (!is_resource($proc)) { - fail('unable to run command:' . $cmd); - } - - fclose($pipes[0]); // no stdin - - $stat = proc_close($proc); - return $stat; -}