]> git.openstreetmap.org Git - nominatim.git/commitdiff
hack around yes quotes in wiki and add a simple sanity check against wiki accidents
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 13 Feb 2012 22:37:03 +0000 (22:37 +0000)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 13 Feb 2012 22:37:03 +0000 (22:37 +0000)
utils/specialphrases.php

index 5b3abe405120f1a913724b903d02340898d45de5..7751a2f79bbf9fd631b531f38712c9fb300713df 100755 (executable)
@@ -3,6 +3,7 @@
 
         require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
         ini_set('memory_limit', '800M');
 
         require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
         ini_set('memory_limit', '800M');
+        ini_set('display_errors', 'stderr');
 
         $aCMDOptions = array(
                 "Import and export special phrases",
 
         $aCMDOptions = array(
                 "Import and export special phrases",
                                        $sLabel = $aMatch[1];
                                        $sClass = $aMatch[2];
                                        $sType = $aMatch[3];
                                        $sLabel = $aMatch[1];
                                        $sClass = $aMatch[2];
                                        $sType = $aMatch[3];
+                                       # hack around a bug where building=yes was imported with
+                                       # quotes into the wiki
+                                       $sType = preg_replace('/&quot;/', '', $sType);
+                                       # sanity check, in case somebody added garbage in the wiki
+                                       if (preg_match('/^\\w+$/', $sClass) < 1 ||
+                                               preg_match('/^\\w+$/', $sType) < 1) {
+                                               trigger_error("Bad class/type for language $sLanguage: $sClass=$sType");
+                                               exit;
+                                       }       
                                        $aPairs[$sClass.'|'.$sType] = array($sClass, $sType);
 
                                        switch(trim($aMatch[4]))
                                        $aPairs[$sClass.'|'.$sType] = array($sClass, $sType);
 
                                        switch(trim($aMatch[4]))