From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 10 Sep 2013 17:26:19 +0000 (+0200)
Subject: disable aux tables
X-Git-Tag: deploy~584
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/2956ea4019bc7272abb335995cb1892fbcda20ef?ds=sidebyside

disable aux tables
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index a01869fd..4d30db98 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -262,6 +262,7 @@
 				$sSQL .= "and 30 between $iMinAddressRank and $iMaxAddressRank ";
 				$sSQL .= "group by place_id";
 				if (!$bDeDupe) $sSQL .= ",place_id";
+				/*
 				$sSQL .= " union ";
 				$sSQL .= "select 'L' as osm_type,place_id as osm_id,'place' as class,'house' as type,null as admin_level,30 as rank_search,30 as rank_address,min(place_id) as place_id,'us' as country_code,";
 				$sSQL .= "get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,";
@@ -276,9 +277,10 @@
 				$sSQL .= "group by place_id";
 				if (!$bDeDupe) $sSQL .= ",place_id";
 				$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
+				*/
 			}
 
-			$sSQL .= "order by importance desc";
+			$sSQL .= " order by importance desc";
 			if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
 			$aSearchResults = $this->oDB->getAll($sSQL);
 
@@ -1149,6 +1151,7 @@
 								$aPlaceIDs = $this->oDB->getCol($sSQL);
 
 								// If not try the aux fallback table
+								/*
 								if (!sizeof($aPlaceIDs))
 								{
 									$sSQL = "select place_id from location_property_aux where parent_place_id in (".$sPlaceIDs.") and housenumber = '".pg_escape_string($aSearch['sHouseNumber'])."'";
@@ -1160,6 +1163,7 @@
 									if (CONST_Debug) var_dump($sSQL);
 									$aPlaceIDs = $this->oDB->getCol($sSQL);
 								}
+								*/
 
 								if (!sizeof($aPlaceIDs))
 								{