From 7b78507ef9c5f45134fd54ac82fe4ad06c5b2be4 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 30 Sep 2012 10:40:44 +0200 Subject: [PATCH] lift restriction on special search term class All too frequent classes are already filtered out on import of the special search term tables. --- website/search.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/search.php b/website/search.php index 1d877e77..f0325f78 100755 --- a/website/search.php +++ b/website/search.php @@ -245,7 +245,7 @@ $sQuery = str_replace($aSpecialTerm[0], ' ', $sQuery); $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 .= ' 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); $aSearchWords = $oDB->getAll($sSQL); $aNewSearches = array(); @@ -313,7 +313,6 @@ $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 .= ' 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'; if (CONST_Debug) var_Dump($sSQL);