Missing some exact name matches when searching for 'special' phrases

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index ff82cadd4f66846c47eda076b75324e0707f34a5..c19d1ade4943737a82b22da94eabc0876681b660 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -40,9 +40,13 @@
           + ($bAsGeoJSON?1:0) 
           + ($bAsKML?1:0) 
           + ($bAsSVG?1:0) 
-          + ($bAsTEXT?1:0) 
-               ) > 1) {
-               echo "Select only one polgyon output option";
+          + ($bAsText?1:0) 
+               ) > CONST_PolygonOutput_MaximumTypes) {
+               if (CONST_PolygonOutput_MaximumTypes) {
+                       userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option");
+               } else {
+                       userError("Polygon output is disabled");
+               }
                exit;
        }
 
@@ -187,7 +191,7 @@
                        $aPoints = explode(',',$_GET['route']);
                        if (sizeof($aPoints) % 2 != 0)
                        {
-                               echo "Uneven number of points";
+                               userError("Uneven number of points");
                                exit;
                        }
                        $sViewboxCentreSQL = "ST_SetSRID('LINESTRING(";
@@ -347,7 +351,7 @@
                                $aPhrase = $oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string");
                                if (PEAR::isError($aPhrase))
                                {
-                                       echo "Illegal query string (not an UTF-8 string): ".$sPhrase;
+                                       userError("Illegal query string (not an UTF-8 string): ".$sPhrase);
                                        if (CONST_Debug) var_dump($aPhrase);
                                        exit;
                                }
@@ -763,7 +767,6 @@
                                                                if (!$aSearch['sClass']) continue;
                                                                if (CONST_Debug) var_dump('<hr>',$aSearch);
                                                                if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);     
-
                                                                $sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
                                                                if ($oDB->getOne($sSQL))
                                                                {
@@ -927,15 +930,17 @@
                                                        {
                                                                $sPlaceIDs = join(',',$aPlaceIDs);
 
+                                                               $aResultPlaceIDs = array();
+
                                                                if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'name')
                                                                {
                                                                        // If they were searching for a named class (i.e. 'Kings Head pub') then we might have an extra match
                                                                        $sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and class='".$aSearch['sClass']."' and type='".$aSearch['sType']."'";
-                                                                       $sSQL = " and linked_place_id is null";
+                                                                       $sSQL .= " and linked_place_id is null";
                                                                        if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";                                                             
                                                                        $sSQL .= " order by rank_search asc limit $iLimit";
                                                                        if (CONST_Debug) var_dump($sSQL);
-                                                                       $aPlaceIDs = $oDB->getCol($sSQL);
+                                                                       $aResultPlaceIDs = $oDB->getCol($sSQL);
                                                                }
                                                                
                                                                if (!$aSearch['sOperator'] || $aSearch['sOperator'] == 'near') // & in
@@ -965,10 +970,10 @@
                                                                        else
                                                                        {
                                                                                $iMaxRank += 5;
-                                                                       $sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank";
-                                                                       if (CONST_Debug) var_dump($sSQL);
-                                                                       $aPlaceIDs = $oDB->getCol($sSQL);
-                                                                       $sPlaceIDs = join(',',$aPlaceIDs);
+                                                                               $sSQL = "select place_id from placex where place_id in ($sPlaceIDs) and rank_search < $iMaxRank";
+                                                                               if (CONST_Debug) var_dump($sSQL);
+                                                                               $aPlaceIDs = $oDB->getCol($sSQL);
+                                                                               $sPlaceIDs = join(',',$aPlaceIDs);
                                                                        }
 
                                                                        if ($sPlaceIDs || $sPlaceGeom)
@@ -985,7 +990,7 @@
                                                                                else if ($sPlaceIDs) $sOrderBySQL = "ST_Distance(l.centroid, f.geometry)";
                                                                                else if ($sPlaceGeom) $sOrderBysSQL = "ST_Distance(st_centroid('".$sPlaceGeom."'), l.centroid)";
                                                                                
-                                                                               $sSQL = "select distinct l.place_id".($sOrderBysSQL?','.$sOrderBysSQL:'')." from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l";
+                                                                               $sSQL = "select distinct l.place_id".($sOrderBySQL?','.$sOrderBySQL:'')." from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." as l";
                                                                                if ($sCountryCodesSQL) $sSQL .= " join placex as lp using (place_id)";
                                                                                if ($sPlaceIDs)
                                                                                {
@@ -1002,11 +1007,11 @@
                                                                                        $sSQL .= " and l.place_id not in (".join(',',$aExcludePlaceIDs).")";
                                                                                }
                                                                                if ($sCountryCodesSQL) $sSQL .= " and lp.country_code in ($sCountryCodesSQL)";
-                                                                               if ($sOrderBy) $sSQL .= "order by ".$OrderBysSQL." asc";
+                                                                               if ($sOrderBySQL) $sSQL .= "order by ".$sOrderBySQL." asc";
                                                                                if ($iOffset) $sSQL .= " offset $iOffset";
                                                                                $sSQL .= " limit $iLimit";
                                                                                if (CONST_Debug) var_dump($sSQL);
-                                                                               $aPlaceIDs = $oDB->getCol($sSQL);
+                                                                               $aResultPlaceIDs = array_merge($aResultPlaceIDs, $oDB->getCol($sSQL));
                                                                        }
                                                                        else
                                                                        {
@@ -1028,10 +1033,13 @@
                                                                                if ($iOffset) $sSQL .= " offset $iOffset";
                                                                                $sSQL .= " limit $iLimit";
                                                                                if (CONST_Debug) var_dump($sSQL);
-                                                                               $aPlaceIDs = $oDB->getCol($sSQL);
+                                                                               $aResultPlaceIDs = array_merge($aResultPlaceIDs, $oDB->getCol($sSQL));
                                                                        }
                                                                        }
                                                                }
+
+                                                               $aPlaceIDs = $aResultPlaceIDs;
+
                                                        }
                                                
                                                }