case statement need : instead of ;. Added more breaks

[nominatim.git] / utils / specialphrases.php

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 10001e9d4db0e210737f52e42c6709df91fc3474..652230fc7dd239f39033aca3126a352b31a0c713 100755 (executable)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -6,17 +6,18 @@ require_once(CONST_BasePath.'/lib/init-cmd.php');
 ini_set('memory_limit', '800M');
 ini_set('display_errors', 'stderr');
 
-    $aCMDOptions = array(
-            "Import and export special phrases",
-            array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
-            array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
-            array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
-            array('countries', '', 0, 1, 0, 0, 'bool', 'Create import script for country codes and names'),
-            array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),
-    );
-    getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
+$aCMDOptions
+= array(
+   "Import and export special phrases",
+   array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
+   array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
+   array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
+   array('countries', '', 0, 1, 0, 0, 'bool', 'Create import script for country codes and names'),
+   array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),
+  );
+getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
-    include(CONST_InstallPath.'/settings/phrase_settings.php');
+include(CONST_InstallPath.'/settings/phrase_settings.php');
 
 
 if ($aCMDResult['countries']) {
@@ -25,24 +26,19 @@ if ($aCMDResult['countries']) {
     echo "select count(*) from (select getorcreate_country(make_standard_name(country_code), country_code) from country_name where country_code is not null) as x;\n";
 
     echo "select count(*) from (select getorcreate_country(make_standard_name(get_name_by_language(country_name.name,ARRAY['name'])), country_code) from country_name where get_name_by_language(country_name.name, ARRAY['name']) is not null) as x;\n";
-    foreach($aLanguageIn as $sLanguage)
-    {
+    foreach ($aLanguageIn as $sLanguage) {
         echo "select count(*) from (select getorcreate_country(make_standard_name(get_name_by_language(country_name.name,ARRAY['name:".$sLanguage."'])), country_code) from country_name where get_name_by_language(country_name.name, ARRAY['name:".$sLanguage."']) is not null) as x;\n";
     }
 }
 
-if ($aCMDResult['wiki-import'])
-{
+if ($aCMDResult['wiki-import']) {
     $aPairs = array();
 
-    foreach($aLanguageIn as $sLanguage)
-    {
+    foreach ($aLanguageIn as $sLanguage) {
         $sURL = 'http://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Special_Phrases/'.strtoupper($sLanguage);
         $sWikiPageXML = file_get_contents($sURL);
-        if (preg_match_all('#\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([\\-YN])#', $sWikiPageXML, $aMatches, PREG_SET_ORDER))
-        {
-            foreach($aMatches as $aMatch)
-            {
+        if (preg_match_all('#\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([^|]+) \\|\\| ([\\-YN])#', $sWikiPageXML, $aMatches, PREG_SET_ORDER)) {
+            foreach ($aMatches as $aMatch) {
                 $sLabel = trim($aMatch[1]);
                 $sClass = trim($aMatch[2]);
                 $sType = trim($aMatch[3]);
@@ -50,8 +46,9 @@ if ($aCMDResult['wiki-import'])
                 # quotes into the wiki
                 $sType = preg_replace('/"/', '', $sType);
                 # sanity check, in case somebody added garbage in the wiki
-                if (preg_match('/^\\w+$/', $sClass) < 1 ||
-                    preg_match('/^\\w+$/', $sType) < 1) {
+                if (preg_match('/^\\w+$/', $sClass) < 1
+                    || preg_match('/^\\w+$/', $sType) < 1
+                ) {
                     trigger_error("Bad class/type for language $sLanguage: $sClass=$sType");
                     exit;
                 }
@@ -67,17 +64,16 @@ if ($aCMDResult['wiki-import'])
                 }
                 $aPairs[$sClass.'|'.$sType] = array($sClass, $sType);
 
-                switch(trim($aMatch[4]))
-                {
-                case 'near':
-                    echo "select getorcreate_amenityoperator(make_standard_name('".pg_escape_string($sLabel)."'), '$sClass', '$sType', 'near');\n";
-                    break;
-                case 'in':
-                    echo "select getorcreate_amenityoperator(make_standard_name('".pg_escape_string($sLabel)."'), '$sClass', '$sType', 'in');\n";
-                    break;
-                default:
-                    echo "select getorcreate_amenity(make_standard_name('".pg_escape_string($sLabel)."'), '$sClass', '$sType');\n";
-                    break;
+                switch (trim($aMatch[4])) {
+                    case 'near':
+                        echo "select getorcreate_amenityoperator(make_standard_name('".pg_escape_string($sLabel)."'), '$sClass', '$sType', 'near');\n";
+                        break;
+                    case 'in':
+                        echo "select getorcreate_amenityoperator(make_standard_name('".pg_escape_string($sLabel)."'), '$sClass', '$sType', 'in');\n";
+                        break;
+                    default:
+                        echo "select getorcreate_amenity(make_standard_name('".pg_escape_string($sLabel)."'), '$sClass', '$sType');\n";
+                        break;
                 }
             }
         }
@@ -85,8 +81,7 @@ if ($aCMDResult['wiki-import'])
 
     echo "create index idx_placex_classtype on placex (class, type);";
 
-    foreach($aPairs as $aPair)
-    {
+    foreach ($aPairs as $aPair) {
         echo "create table place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]);
         if (CONST_Tablespace_Aux_Data)
             echo " tablespace ".CONST_Tablespace_Aux_Data;
@@ -107,7 +102,6 @@ if ($aCMDResult['wiki-import'])
         echo ";\n";
 
         echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]).' TO "'.CONST_Database_Web_User."\";\n";
-
     }
 
     echo "drop index idx_placex_classtype;";