move complete search query code into SearchDescription

diff --git a/lib/Geocode.php b/lib/Geocode.php
index b27f69e8647e27eb0aaf308cd91df9bde9d059dd..27c33ad68fae7896bb2c852fadd60fc3dad38636 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1026,10 +1026,6 @@ class Geocode
                 // Any words that have failed completely?
                 // TODO: suggestions
 
-                // Start the search process
-                // array with: placeid => -1 | tiger-housenumber
-                $aResultPlaceIDs = array();
-
                 $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases, $sNormQuery);
 
                 if ($this->bReverseInPlan) {
@@ -1084,104 +1080,38 @@ class Geocode
 
             if (CONST_Debug) _debugDumpGroupedSearches($aGroupedSearches, $aValidTokens);
 
+            // Start the search process
+            // array with: placeid => -1 | tiger-housenumber
+            $aResultPlaceIDs = array();
             $iGroupLoop = 0;
             $iQueryLoop = 0;
             foreach ($aGroupedSearches as $iGroupedRank => $aSearches) {
                 $iGroupLoop++;
                 foreach ($aSearches as $oSearch) {
                     $iQueryLoop++;
-                    $searchedHousenumber = -1;
-
-                    if (CONST_Debug) echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>";
-                    if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($oSearch)), $aValidTokens);
-
-                    $aPlaceIDs = array();
-                    if ($oSearch->isCountrySearch()) {
-                        // Just looking for a country - look it up
-                        if (4 >= $this->iMinAddressRank && 4 <= $this->iMaxAddressRank) {
-                            $aPlaceIDs = $oSearch->queryCountry($this->oDB);
-                        }
-                    } elseif (!$oSearch->isNamedSearch()) {
-                        // looking for a POI in a geographic area
-                        if (!$oCtx->isBoundedSearch()) {
-                            continue;
-                        }
-                        $aPlaceIDs = $oSearch->queryNearbyPoi($this->oDB, $this->iLimit);
-                    } elseif ($oSearch->isOperator(Operator::POSTCODE)) {
-                        // looking for postcode
-                        $aPlaceIDs = $oSearch->queryPostcode($this->oDB, $this->iLimit);
-                    } else {
-                        // Ordinary search:
-                        // First search for places according to name and address.
-                        $aNamedPlaceIDs = $oSearch->queryNamedPlace(
-                            $this->oDB,
-                            $aWordFrequencyScores,
-                            $this->iMinAddressRank,
-                            $this->iMaxAddressRank,
-                            $this->iLimit
-                        );
-
-                        if (sizeof($aNamedPlaceIDs)) {
-                            foreach ($aNamedPlaceIDs as $aRow) {
-                                $aPlaceIDs[] = $aRow['place_id'];
-                                $this->exactMatchCache[$aRow['place_id']] = $aRow['exactmatch'];
-                            }
-                        }
-
-                        //now search for housenumber, if housenumber provided
-                        if ($oSearch->hasHouseNumber() && sizeof($aPlaceIDs)) {
-                            $aResult = $oSearch->queryHouseNumber(
-                                $this->oDB,
-                                $aPlaceIDs,
-                                $this->iLimit
-                            );
-
-                            if (sizeof($aResult)) {
-                                $searchedHousenumber = $aResult['iHouseNumber'];
-                                $aPlaceIDs = $aResult['aPlaceIDs'];
-                            } elseif (!$oSearch->looksLikeFullAddress()) {
-                                $aPlaceIDs = array();
-                            }
-                        }
-
-                        // finally get POIs if requested
-                        if ($oSearch->isPoiSearch() && sizeof($aPlaceIDs)) {
-                            $aPlaceIDs = $oSearch->queryPoiByOperator(
-                                $this->oDB,
-                                $aPlaceIDs,
-                                $this->iLimit
-                            );
-                        }
-                    }
 
                     if (CONST_Debug) {
-                        echo "<br><b>Place IDs:</b> ";
-                        var_Dump($aPlaceIDs);
+                        echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>";
+                        _debugDumpGroupedSearches(array($iGroupedRank => array($oSearch)), $aValidTokens);
                     }
 
-                    if (sizeof($aPlaceIDs) && $oSearch->getPostcode()) {
-                        $sSQL = 'SELECT place_id FROM placex';
-                        $sSQL .= ' WHERE place_id in ('.join(',', $aPlaceIDs).')';
-                        $sSQL .= " AND postcode = '".$oSearch->getPostcode()."'";
-                        if (CONST_Debug) var_dump($sSQL);
-                        $aFilteredPlaceIDs = chksql($this->oDB->getCol($sSQL));
-                        if ($aFilteredPlaceIDs) {
-                            $aPlaceIDs = $aFilteredPlaceIDs;
-                            if (CONST_Debug) {
-                                echo "<br><b>Place IDs after postcode filtering:</b> ";
-                                var_Dump($aPlaceIDs);
-                            }
-                        }
-                    }
+                    $aRes = $oSearch->query(
+                        $this->oDB,
+                        $aWordFrequencyScores,
+                        $this->exactMatchCache,
+                        $this->iMinAddressRank,
+                        $this->iMaxAddressRank,
+                        $this->iLimit
+                    );
 
-                    foreach ($aPlaceIDs as $iPlaceID) {
+                    foreach ($aRes['IDs'] as $iPlaceID) {
                         // array for placeID => -1 | Tiger housenumber
-                        $aResultPlaceIDs[$iPlaceID] = $searchedHousenumber;
+                        $aResultPlaceIDs[$iPlaceID] = $aRes['houseNumber'];
                     }
                     if ($iQueryLoop > 20) break;
                 }
 
-                if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30)) {
+                if (sizeof($aResultPlaceIDs) && ($this->iMinAddressRank != 0 || $this->iMaxAddressRank != 30)) {
                     // Need to verify passes rank limits before dropping out of the loop (yuk!)
                     // reduces the number of place ids, like a filter
                     // rank_address is 30 for interpolated housenumbers
@@ -1224,14 +1154,13 @@ class Geocode
                     $aResultPlaceIDs = $tempIDs;
                 }
 
-                //exit;
-                if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) break;
+                if (sizeof($aResultPlaceIDs)) break;
                 if ($iGroupLoop > 4) break;
                 if ($iQueryLoop > 30) break;
             }
 
             // Did we find anything?
-            if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs)) {
+            if (sizeof($aResultPlaceIDs)) {
                 $aSearchResults = $this->getDetails($aResultPlaceIDs, $oCtx);
             }
         } else {

diff --git a/lib/SearchDescription.php b/lib/SearchDescription.php
index 39f7ffca90910c9b2b416d952156982ef90fd9ec..f3afaff2edc1d2e3ec5236161cb8eb5585345a4b 100644 (file)
--- a/lib/SearchDescription.php
+++ b/lib/SearchDescription.php
@@ -59,11 +59,6 @@ class SearchDescription
         return $this->iSearchRank;
     }
 
-    public function getPostCode()
-    {
-        return $this->sPostcode;
-    }
-
     public function setPoiSearch($iOperator, $sClass, $sType)
     {
         $this->iOperator = $iOperator;
@@ -71,22 +66,6 @@ class SearchDescription
         $this->sType = $sType;
     }
 
-    public function isNamedSearch()
-    {
-        return sizeof($this->aName) > 0 || sizeof($this->aAddress) > 0;
-    }
-
-    public function isCountrySearch()
-    {
-        return $this->sCountryCode && sizeof($this->aName) == 0
-               && !$this->iOperator && !$this->oContext->hasNearPoint();
-    }
-
-    public function isPoiSearch()
-    {
-        return (bool) $this->sClass;
-    }
-
     public function looksLikeFullAddress()
     {
         return sizeof($this->aName)
@@ -94,16 +73,6 @@ class SearchDescription
                && preg_match('/[0-9]+/', $this->sHouseNumber);
     }
 
-    public function isOperator($iType)
-    {
-        return $this->iOperator == $iType;
-    }
-
-    public function hasHouseNumber()
-    {
-        return (bool) $this->sHouseNumber;
-    }
-
     private function poiTable()
     {
         return 'place_classtype_'.$this->sClass.'_'.$this->sType;
@@ -366,8 +335,91 @@ class SearchDescription
 
     /////////// Query functions
 
+    public function query(&$oDB, &$aWordFrequencyScores, &$aExactMatchCache, $iMinRank, $iMaxRank, $iLimit)
+    {
+        $aPlaceIDs = array();
+        $iHousenumber = -1;
+
+        if ($this->sCountryCode
+            && !sizeof($this->aName)
+            && !$this->iOperator
+            && !$this->sClass
+            && !$this->oContext->hasNearPoint()
+        ) {
+            // Just looking for a country - look it up
+            if (4 >= $iMinRank && 4 <= $iMaxRank) {
+                $aPlaceIDs = $this->queryCountry($oDB);
+            }
+        } elseif (!sizeof($this->aName) && !sizeof($this->aAddress)) {
+            // Neither name nor address? Then we must be
+            // looking for a POI in a geographic area.
+            if ($this->oContext->isBoundedSearch()) {
+                $aPlaceIDs = $this->queryNearbyPoi($oDB, $iLimit);
+            }
+        } elseif ($this->iOperator == Operator::POSTCODE) {
+            // looking for postcode
+            $aPlaceIDs = $this->queryPostcode($oDB, $iLimit);
+        } else {
+            // Ordinary search:
+            // First search for places according to name and address.
+            $aNamedPlaceIDs = $this->queryNamedPlace(
+                $oDB,
+                $aWordFrequencyScores,
+                $iMinRank,
+                $iMaxRank,
+                $iLimit
+            );
+
+            if (sizeof($aNamedPlaceIDs)) {
+                foreach ($aNamedPlaceIDs as $aRow) {
+                    $aPlaceIDs[] = $aRow['place_id'];
+                    $aExactMatchCache[$aRow['place_id']] = $aRow['exactmatch'];
+                }
+            }
+
+            //now search for housenumber, if housenumber provided
+            if ($this->sHouseNumber && sizeof($aPlaceIDs)) {
+                $aResult = $this->queryHouseNumber($oDB, $aPlaceIDs, $iLimit);
+
+                if (sizeof($aResult)) {
+                    $iHousenumber = $aResult['iHouseNumber'];
+                    $aPlaceIDs = $aResult['aPlaceIDs'];
+                } elseif (!$this->looksLikeFullAddress()) {
+                    $aPlaceIDs = array();
+                }
+            }
+
+            // finally get POIs if requested
+            if ($this->sClass && sizeof($aPlaceIDs)) {
+                $aPlaceIDs = $this->queryPoiByOperator($oDB, $aPlaceIDs, $iLimit);
+            }
+        }
+
+        if (CONST_Debug) {
+            echo "<br><b>Place IDs:</b> ";
+            var_Dump($aPlaceIDs);
+        }
+
+        if (sizeof($aPlaceIDs) && $this->sPostcode) {
+            $sSQL = 'SELECT place_id FROM placex';
+            $sSQL .= ' WHERE place_id in ('.join(',', $aPlaceIDs).')';
+            $sSQL .= " AND postcode = '".$this->sPostcode."'";
+            if (CONST_Debug) var_dump($sSQL);
+            $aFilteredPlaceIDs = chksql($oDB->getCol($sSQL));
+            if ($aFilteredPlaceIDs) {
+                $aPlaceIDs = $aFilteredPlaceIDs;
+                if (CONST_Debug) {
+                    echo "<br><b>Place IDs after postcode filtering:</b> ";
+                    var_Dump($aPlaceIDs);
+                }
+            }
+        }
+
+        return array('IDs' => $aPlaceIDs, 'houseNumber' => $iHousenumber);
+    }
+
 
-    public function queryCountry(&$oDB)
+    private function queryCountry(&$oDB)
     {
         $sSQL = 'SELECT place_id FROM placex ';
         $sSQL .= "WHERE country_code='".$this->sCountryCode."'";
@@ -382,7 +434,7 @@ class SearchDescription
         return chksql($oDB->getCol($sSQL));
     }
 
-    public function queryNearbyPoi(&$oDB, $iLimit)
+    private function queryNearbyPoi(&$oDB, $iLimit)
     {
         if (!$this->sClass) {
             return array();
@@ -433,7 +485,7 @@ class SearchDescription
         return array();
     }
 
-    public function queryPostcode(&$oDB, $iLimit)
+    private function queryPostcode(&$oDB, $iLimit)
     {
         $sSQL = 'SELECT p.place_id FROM location_postcode p ';
 
@@ -456,7 +508,7 @@ class SearchDescription
         return chksql($oDB->getCol($sSQL));
     }
 
-    public function queryNamedPlace(&$oDB, $aWordFrequencyScores, $iMinAddressRank, $iMaxAddressRank, $iLimit)
+    private function queryNamedPlace(&$oDB, $aWordFrequencyScores, $iMinAddressRank, $iMaxAddressRank, $iLimit)
     {
         $aTerms = array();
         $aOrder = array();
@@ -586,7 +638,7 @@ class SearchDescription
         return array();
     }
 
-    public function queryHouseNumber(&$oDB, $aRoadPlaceIDs, $iLimit)
+    private function queryHouseNumber(&$oDB, $aRoadPlaceIDs, $iLimit)
     {
         $sPlaceIDs = join(',', $aRoadPlaceIDs);
 
@@ -680,7 +732,7 @@ class SearchDescription
     }
 
 
-    public function queryPoiByOperator(&$oDB, $aParentIDs, $iLimit)
+    private function queryPoiByOperator(&$oDB, $aParentIDs, $iLimit)
     {
         $sPlaceIDs = join(',', $aParentIDs);
         $aClassPlaceIDs = array();