osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-23 04:53:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

lift restriction on special search term class

Browse Source 
All too frequent classes are already filtered out on import of the
special search term tables.
This commit is contained in:
Sarah Hoffmann 2012-09-30 10:40:44 +02:00
parent ee2863200c
commit 7b78507ef9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
website/search.php
View File

@ -245,7 +245,7 @@
$sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery); $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery);
$sToken = $oDB->getOne("select make_standard_name('".$aSpecialTerm[1]."') as string"); $sToken = $oDB->getOne("select make_standard_name('".$aSpecialTerm[1]."') as string");
$sSQL = 'select * from (select word_id,word_token, word, class, type, location, country_code, operator'; $sSQL = 'select * from (select word_id,word_token, word, class, type, location, country_code, operator';
$sSQL .= ' from word where word_token in (\' '.$sToken.'\')) as x where (class is not null and class not in (\'place\',\'highway\')) or country_code is not null'; $sSQL .= ' from word where word_token in (\' '.$sToken.'\')) as x where (class is not null and class not in (\'place\')) or country_code is not null';
if (CONST_Debug) var_Dump($sSQL); if (CONST_Debug) var_Dump($sSQL);
$aSearchWords = $oDB->getAll($sSQL); $aSearchWords = $oDB->getAll($sSQL);
$aNewSearches = array(); $aNewSearches = array();
@ -313,7 +313,6 @@
$sSQL = 'select word_id,word_token, word, class, type, location, country_code, operator'; $sSQL = 'select word_id,word_token, word, class, type, location, country_code, operator';
$sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')'; $sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')';
$sSQL .= ' and search_name_count < '.CONST_Max_Word_Frequency; $sSQL .= ' and search_name_count < '.CONST_Max_Word_Frequency;
$sSQL .= ' and (class is null or class not in (\'highway\'))';
// $sSQL .= ' group by word_token, word, class, type, location, country_code'; // $sSQL .= ' group by word_token, word, class, type, location, country_code';
if (CONST_Debug) var_Dump($sSQL); if (CONST_Debug) var_Dump($sSQL);