NearPoint::extractFromQuery - greedy-match optional quote sign

[nominatim.git] / utils / country_languages.php

diff --git a/utils/country_languages.php b/utils/country_languages.php
index 9d3b1e810c5ac4da3b97d24ef3047504ba38e66b..5608247e8de231e34bf2d2d186b9fe00bf02e322 100755 (executable)
--- a/utils/country_languages.php
+++ b/utils/country_languages.php
@@ -4,33 +4,30 @@
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 
-    ini_set('memory_limit', '800M');
-    ini_set('display_errors', 'stderr');
+ini_set('memory_limit', '800M');
+ini_set('display_errors', 'stderr');
 
-    $aCMDOptions = array(
-            "Import country language data from osm wiki",
-            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'),
-    );
-    getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
+$aCMDOptions
+ = array(
+    "Import country language data from osm wiki",
+    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'),
+   );
+getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
 include(CONST_InstallPath.'/settings/phrase_settings.php');
 
-if (true)
-{
+if (true) {
     $sURL = 'http://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Country_Codes';
     $sWikiPageXML = file_get_contents($sURL);
-    if (preg_match_all('#\\| ([a-z]{2}) \\|\\| [^|]+\\|\\| ([a-z,]+)#', $sWikiPageXML, $aMatches, PREG_SET_ORDER))
-    {
-        foreach($aMatches as $aMatch)
-        {
+    if (preg_match_all('#\\| ([a-z]{2}) \\|\\| [^|]+\\|\\| ([a-z,]+)#', $sWikiPageXML, $aMatches, PREG_SET_ORDER)) {
+        foreach ($aMatches as $aMatch) {
             $aLanguages = explode(',', $aMatch[2]);
-            foreach($aLanguages as $i => $s)
-            {
+            foreach ($aLanguages as $i => $s) {
                 $aLanguages[$i] = '"'.pg_escape_string($s).'"';
             }
-            echo "UPDATE country_name set country_default_language_codes = '{".join(',',$aLanguages)."}' where country_code = '".pg_escape_string($aMatch[1])."';\n";
+            echo "UPDATE country_name set country_default_language_codes = '{".join(',', $aLanguages)."}' where country_code = '".pg_escape_string($aMatch[1])."';\n";
         }
     }
 }