download and merge wikipedia access logs

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 0e4bd0a0ab60dbe1ec2f03d7a732b1db1923b2fa..d660e8b3b2f926a0ed217b6989d00e4d22c4c57a 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -465,7 +465,7 @@
                                // Commas are used to reduce the search space by indicating where phrases split
                                if ($this->aStructuredQuery)
                                {
                                // Commas are used to reduce the search space by indicating where phrases split
                                if ($this->aStructuredQuery)
                                {

-                                       $aPhrases = $aStructuredQuery;
+                                       $aPhrases = $this->aStructuredQuery;

                                        $bStructuredPhrases = true;
                                }
                                else
                                        $bStructuredPhrases = true;
                                }
                                else


@@ -1317,10 +1317,10 @@
                                                $sSQL = "select place_id from placex where place_id in (".join(',',$aResultPlaceIDs).") ";
                                                $sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";
                                                $sSQL = "select place_id from placex where place_id in (".join(',',$aResultPlaceIDs).") ";
                                                $sSQL .= "and (placex.rank_address between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                if (14 >= $this->iMinAddressRank && 14 <= $this->iMaxAddressRank) $sSQL .= " OR (extratags->'place') = 'city'";

-                                               if ($aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$aAddressRankList).")";
+                                               if ($this->aAddressRankList) $sSQL .= " OR placex.rank_address in (".join(',',$this->aAddressRankList).")";

                                                $sSQL .= ") UNION select place_id from location_property_tiger where place_id in (".join(',',$aResultPlaceIDs).") ";
                                                $sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";
                                                $sSQL .= ") UNION select place_id from location_property_tiger where place_id in (".join(',',$aResultPlaceIDs).") ";
                                                $sSQL .= "and (30 between $this->iMinAddressRank and $this->iMaxAddressRank ";

-                                               if ($aAddressRankList) $sSQL .= " OR 30 in (".join(',',$aAddressRankList).")";
+                                               if ($this->aAddressRankList) $sSQL .= " OR 30 in (".join(',',$this->aAddressRankList).")";

                                                $sSQL .= ")";
                                                if (CONST_Debug) var_dump($sSQL);
                                                $aResultPlaceIDs = $this->oDB->getCol($sSQL);
                                                $sSQL .= ")";
                                                if (CONST_Debug) var_dump($sSQL);
                                                $aResultPlaceIDs = $this->oDB->getCol($sSQL);