hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

correctly quote regular expression

Browse Source
This commit is contained in:
Sarah Hoffmann
2015-03-29 17:23:06 +02:00
parent 987b6a70c9
commit aaabf70a1c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Geocode.php
View File

@@ -1591,9 +1591,11 @@
$aRecheckWords = preg_split('/\b[\s,\\-]*/u',$sQuery); $aRecheckWords = preg_split('/\b[\s,\\-]*/u',$sQuery);
foreach($aRecheckWords as $i => $sWord) foreach($aRecheckWords as $i => $sWord)
{ {
if (!$sWord) unset($aRecheckWords[$i]); if (!preg_match('/\pL/', $sWord)) unset($aRecheckWords[$i]);
} }
if (CONST_Debug) { echo '<i>Recheck words:<\i>'; var_dump($aRecheckWords); }
foreach($aSearchResults as $iResNum => $aResult) foreach($aSearchResults as $iResNum => $aResult)
{ {
if (CONST_Search_AreaPolygons) if (CONST_Search_AreaPolygons)
@@ -1752,7 +1754,7 @@
if (stripos($sAddress, $sWord)!==false) if (stripos($sAddress, $sWord)!==false)
{ {
$iCountWords++; $iCountWords++;
if (preg_match("/(^|,)\s*$sWord\s*(,|$)/", $sAddress)) $iCountWords += 0.1; if (preg_match("/(^|,)\s*".preg_quote($sWord, '/')."\s*(,|$)/", $sAddress)) $iCountWords += 0.1;
} }
} }