Merge pull request #798 from mtmail/coordinate-extract-missing-first-minus-sign

[nominatim.git] / lib / cmd.php

diff --git a/lib/cmd.php b/lib/cmd.php
index a5a6ba5bca7c4a7ec10a38eb9c963b7191e4804e..d7ba285d431b8ab1e1a594b75c84abe31fc11498 100644 (file)
--- a/lib/cmd.php
+++ b/lib/cmd.php
@@ -1,14 +1,13 @@
 <?php
 
 <?php
 

+

 function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnknown = false)
 {
     $aQuick = array();
     $aCounts = array();
 
 function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnknown = false)
 {
     $aQuick = array();
     $aCounts = array();
 

-    foreach($aSpec as $aLine)
-    {
-        if (is_array($aLine))
-        {
+    foreach ($aSpec as $aLine) {
+        if (is_array($aLine)) {

             if ($aLine[0]) $aQuick['--'.$aLine[0]] = $aLine;
             if ($aLine[1]) $aQuick['-'.$aLine[1]] = $aLine;
             $aCounts[$aLine[0]] = 0;
             if ($aLine[0]) $aQuick['--'.$aLine[0]] = $aLine;
             if ($aLine[1]) $aQuick['-'.$aLine[1]] = $aLine;
             $aCounts[$aLine[0]] = 0;


@@ -18,73 +17,59 @@ function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnkn
     $aResult = array();
     $bUnknown = false;
     $iSize = sizeof($aArg);
     $aResult = array();
     $bUnknown = false;
     $iSize = sizeof($aArg);

-    for ($i = 1; $i < $iSize; $i++)
-    {
-        if (isset($aQuick[$aArg[$i]]))
-        {
+    for ($i = 1; $i < $iSize; $i++) {
+        if (isset($aQuick[$aArg[$i]])) {

             $aLine = $aQuick[$aArg[$i]];
             $aCounts[$aLine[0]]++;
             $xVal = null;
             $aLine = $aQuick[$aArg[$i]];
             $aCounts[$aLine[0]]++;
             $xVal = null;

-            if ($aLine[4] == $aLine[5])
-            {
-                if ($aLine[4])
-                {
+            if ($aLine[4] == $aLine[5]) {
+                if ($aLine[4]) {

                     $xVal = array();
                     $xVal = array();

-                    for($n = $aLine[4]; $i < $iSize && $n; $n--)
-                    {
+                    for ($n = $aLine[4]; $i < $iSize && $n; $n--) {

                         $i++;
                         if ($i >= $iSize || $aArg[$i][0] == '-') showUsage($aSpec, $bExitOnError, 'Parameter of  \''.$aLine[0].'\' is missing');
 
                         $i++;
                         if ($i >= $iSize || $aArg[$i][0] == '-') showUsage($aSpec, $bExitOnError, 'Parameter of  \''.$aLine[0].'\' is missing');
 

-                        switch ($aLine[6])
-                        {
-                        case 'realpath':
-                            $xVal[] = realpath($aArg[$i]);
-                            break;
-                        case 'realdir':
-                            $sPath = realpath(dirname($aArg[$i]));
-                            if ($sPath)
-                                $xVal[] = $sPath . '/' . basename($aArg[$i]);
-                            else
-                                $xVal[] = $sPath;
-                            break;
-                        case 'bool':
-                            $xVal[] = (bool)$aArg[$i];
-                            break;
-                        case 'int':
-                            $xVal[] = (int)$aArg[$i];
-                            break;
-                        case 'float':
-                            $xVal[] = (float)$aArg[$i];
-                            break;
-                        default:
-                            $xVal[] = $aArg[$i];
-                            break;
+                        switch ($aLine[6]) {
+                            case 'realpath':
+                                $xVal[] = realpath($aArg[$i]);
+                                break;
+                            case 'realdir':
+                                $sPath = realpath(dirname($aArg[$i]));
+                                if ($sPath) {
+                                    $xVal[] = $sPath . '/' . basename($aArg[$i]);
+                                } else {
+                                    $xVal[] = $sPath;
+                                }
+                                break;
+                            case 'bool':
+                                $xVal[] = (bool)$aArg[$i];
+                                break;
+                            case 'int':
+                                $xVal[] = (int)$aArg[$i];
+                                break;
+                            case 'float':
+                                $xVal[] = (float)$aArg[$i];
+                                break;
+                            default:
+                                $xVal[] = $aArg[$i];
+                                break;

                         }
                     }
                     if ($aLine[4] == 1) $xVal = $xVal[0];
                         }
                     }
                     if ($aLine[4] == 1) $xVal = $xVal[0];

-                }
-                else
-                {
+                } else {

                     $xVal = true;
                 }
                     $xVal = true;
                 }

-            }
-            else
-            {
+            } else {

                 fail('Variable numbers of params not yet supported');
             }
 
                 fail('Variable numbers of params not yet supported');
             }
 

-            if ($aLine[3] > 1)
-            {
+            if ($aLine[3] > 1) {

                 if (!array_key_exists($aLine[0], $aResult)) $aResult[$aLine[0]] = array();
                 $aResult[$aLine[0]][] = $xVal;
                 if (!array_key_exists($aLine[0], $aResult)) $aResult[$aLine[0]] = array();
                 $aResult[$aLine[0]][] = $xVal;

-            }
-            else
-            {
+            } else {

                 $aResult[$aLine[0]] = $xVal;
             }
                 $aResult[$aLine[0]] = $xVal;
             }

-        }
-        else
-        {
+        } else {

             $bUnknown = $aArg[$i];
         }
     }
             $bUnknown = $aArg[$i];
         }
     }


@@ -92,18 +77,15 @@ function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnkn
     if (array_key_exists('help', $aResult)) showUsage($aSpec);
     if ($bUnknown && $bExitOnUnknown) showUsage($aSpec, $bExitOnError, 'Unknown option \''.$bUnknown.'\'');
 
     if (array_key_exists('help', $aResult)) showUsage($aSpec);
     if ($bUnknown && $bExitOnUnknown) showUsage($aSpec, $bExitOnError, 'Unknown option \''.$bUnknown.'\'');
 

-    foreach($aSpec as $aLine)
-    {
-        if (is_array($aLine))
-        {
+    foreach ($aSpec as $aLine) {
+        if (is_array($aLine)) {

             if ($aCounts[$aLine[0]] < $aLine[2]) showUsage($aSpec, $bExitOnError, 'Option \''.$aLine[0].'\' is missing');
             if ($aCounts[$aLine[0]] > $aLine[3]) showUsage($aSpec, $bExitOnError, 'Option \''.$aLine[0].'\' is pressent too many times');
             if ($aCounts[$aLine[0]] < $aLine[2]) showUsage($aSpec, $bExitOnError, 'Option \''.$aLine[0].'\' is missing');
             if ($aCounts[$aLine[0]] > $aLine[3]) showUsage($aSpec, $bExitOnError, 'Option \''.$aLine[0].'\' is pressent too many times');

-            switch ($aLine[6])
-            {
-            case 'bool':
-                if (!array_key_exists($aLine[0], $aResult))
-                    $aResult[$aLine[0]] = false;
-                break;
+            switch ($aLine[6]) {
+                case 'bool':
+                    if (!array_key_exists($aLine[0], $aResult))
+                        $aResult[$aLine[0]] = false;
+                    break;

             }
         }
     }
             }
         }
     }


@@ -112,31 +94,25 @@ function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnkn
 
 function showUsage($aSpec, $bExit = false, $sError = false)
 {
 
 function showUsage($aSpec, $bExit = false, $sError = false)
 {

-    if ($sError)
-    {
+    if ($sError) {

         echo basename($_SERVER['argv'][0]).': '.$sError."\n";
         echo 'Try `'.basename($_SERVER['argv'][0]).' --help` for more information.'."\n";
         exit;
     }
     echo "Usage: ".basename($_SERVER['argv'][0])."\n";
     $bFirst = true;
         echo basename($_SERVER['argv'][0]).': '.$sError."\n";
         echo 'Try `'.basename($_SERVER['argv'][0]).' --help` for more information.'."\n";
         exit;
     }
     echo "Usage: ".basename($_SERVER['argv'][0])."\n";
     $bFirst = true;

-    foreach($aSpec as $aLine)
-    {
-        if (is_array($aLine))
-        {
-            if ($bFirst)
-            {
+    foreach ($aSpec as $aLine) {
+        if (is_array($aLine)) {
+            if ($bFirst) {

                 $bFirst = false;
                 echo "\n";
             }
             $aNames = array();
             if ($aLine[1]) $aNames[] = '-'.$aLine[1];
             if ($aLine[0]) $aNames[] = '--'.$aLine[0];
                 $bFirst = false;
                 echo "\n";
             }
             $aNames = array();
             if ($aLine[1]) $aNames[] = '-'.$aLine[1];
             if ($aLine[0]) $aNames[] = '--'.$aLine[0];

-            $sName = join(', ',$aNames);
-            echo '  '.$sName.str_repeat(' ',30-strlen($sName)).$aLine[7]."\n";
-        }
-        else
-        {
+            $sName = join(', ', $aNames);
+            echo '  '.$sName.str_repeat(' ', 30-strlen($sName)).$aLine[7]."\n";
+        } else {

             echo $aLine."\n";
         }
     }
             echo $aLine."\n";
         }
     }


@@ -146,10 +122,29 @@ function showUsage($aSpec, $bExit = false, $sError = false)
 
 function chksql($oSql, $sMsg = false)
 {
 
 function chksql($oSql, $sMsg = false)
 {

-    if (PEAR::isError($oSql))
-    {
+    if (PEAR::isError($oSql)) {

         fail($sMsg || $oSql->getMessage(), $oSql->userinfo);
     }
 
     return $oSql;
 }
         fail($sMsg || $oSql->getMessage(), $oSql->userinfo);
     }
 
     return $oSql;
 }

+
+function info($sMsg)
+{
+    echo date('Y-m-d H:i:s == ').$sMsg."\n";
+}
+
+$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";
+    }
+}