From: Sarah Hoffmann Date: Mon, 13 Feb 2012 22:37:03 +0000 (+0000) Subject: hack around yes quotes in wiki and add a simple sanity check against wiki accidents X-Git-Tag: v2.0.0~113 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/5d10d538a54f127c074ac5ecd6459f0010d649f6 hack around yes quotes in wiki and add a simple sanity check against wiki accidents --- diff --git a/utils/specialphrases.php b/utils/specialphrases.php index 5b3abe40..7751a2f7 100755 --- a/utils/specialphrases.php +++ b/utils/specialphrases.php @@ -3,6 +3,7 @@ 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", @@ -63,6 +64,15 @@ $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('/"/', '', $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]))