encapsulate icon URL in a function

[nominatim.git] / lib / cmd.php

diff --git a/lib/cmd.php b/lib/cmd.php
index 436690696b96c4ee6dbddea0faf9b1dd9793ea98..72b666088d1248b601d3edcfad521e99c89da139 100644 (file)
--- a/lib/cmd.php
+++ b/lib/cmd.php
@@ -1,5 +1,6 @@
 <?php
 
 <?php
 

+require_once(CONST_BasePath.'/lib/Shell.php');

 
 function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnknown = false)
 {
 
 function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnknown = false)
 {


@@ -120,11 +121,6 @@ function showUsage($aSpec, $bExit = false, $sError = false)
     exit;
 }
 
     exit;
 }
 

-function chksql($oSql, $sMsg = false)
-{
-    return $oSql;
-}
-

 function info($sMsg)
 {
     echo date('Y-m-d H:i:s == ').$sMsg."\n";
 function info($sMsg)
 {
     echo date('Y-m-d H:i:s == ').$sMsg."\n";


@@ -153,30 +149,33 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError
     // Convert database DSN to psql parameters
     $aDSNInfo = \Nominatim\DB::parseDSN(CONST_Database_DSN);
     if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
     // Convert database DSN to psql parameters
     $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']) {
     if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {

-        $sCMD .= ' -h ' . $aDSNInfo['hostspec'];
+        $oCmd->addParams('--host', $aDSNInfo['hostspec']);

     }
     if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
     }
     if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {

-        $sCMD .= ' -U ' . $aDSNInfo['username'];
+        $oCmd->addParams('--username', $aDSNInfo['username']);

     }
     }

-    $aProcEnv = null;
-    if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
-        $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV);
+    if (isset($aDSNInfo['password'])) {
+        $oCmd->addEnvPair('PGPASSWORD', $aDSNInfo['password']);

     }
     if (!$bVerbose) {
     }
     if (!$bVerbose) {

-        $sCMD .= ' -q';
+        $oCmd->addParams('--quiet');

     }
     if ($bfatal && !$bIgnoreErrors) {
     }
     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;
     $aDescriptors = array(
                      0 => array('pipe', 'r'),
                      1 => STDOUT,
                      2 => STDERR
                     );
     $ahPipes = null;

-    $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes, null, $aProcEnv);
+    $hProcess = @proc_open($oCmd->escapedCmd(), $aDescriptors, $ahPipes, null, $oCmd->aEnv);

     if (!is_resource($hProcess)) {
         fail('unable to start pgsql');
     }
     if (!is_resource($hProcess)) {
         fail('unable to start pgsql');
     }


@@ -196,23 +195,3 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError
         fail("pgsql returned with error code ($iReturn)");
     }
 }
         fail("pgsql returned with error code ($iReturn)");
     }
 }

-
-
-function runWithEnv($sCmd, $aEnv)
-{
-    $aFDs = array(
-             0 => array('pipe', 'r'),
-             1 => STDOUT,
-             2 => STDERR
-            );
-    $aPipes = null;
-    $hProc = @proc_open($sCmd, $aFDs, $aPipes, null, $aEnv);
-    if (!is_resource($hProc)) {
-        fail('unable to run command:' . $sCmd);
-    }
-
-    fclose($aPipes[0]); // no stdin
-
-    $iStat = proc_close($hProc);
-    return $iStat;
-}