X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/46cef36184dc530518068a6a84ba6becd96e09bd..0419aada6e1045b8702bdf6ef4496c8c36d07695:/lib/lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 7b1cbb8f..fccda314 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -77,7 +77,7 @@
 	function getProcessorCount()
 	{
 		$sCPU = file_get_contents('/proc/cpuinfo');
-		preg_match_all('#processor	: [0-9]+#', $sCPU, $aMatches);
+		preg_match_all('#processor\s+: [0-9]+#', $sCPU, $aMatches);
 		return sizeof($aMatches[0]);
 	}
 
@@ -115,8 +115,8 @@
 		   return ($a['aPointPolygon']['numfeatures'] > $b['aPointPolygon']['numfeatures']?-1:1);
 		   if ($a['aPointPolygon']['area'] != $b['aPointPolygon']['area'])
 		   return ($a['aPointPolygon']['area'] > $b['aPointPolygon']['area']?-1:1);
-		//		if ($a['levenshtein'] != $b['levenshtein'])
-		//			return ($a['levenshtein'] < $b['levenshtein']?-1:1);
+		//      if ($a['levenshtein'] != $b['levenshtein'])
+		//          return ($a['levenshtein'] < $b['levenshtein']?-1:1);
 		if ($a['rank_search'] != $b['rank_search'])
 		return ($a['rank_search'] < $b['rank_search']?-1:1);
 		 */
@@ -805,7 +805,7 @@
 	}
 
 
-	function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $housenumber, $bRaw = false)
+	function getAddressDetails(&$oDB, $sLanguagePrefArraySQL, $iPlaceID, $sCountryCode = false, $housenumber = -1, $bRaw = false)
 	{
 		$sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata($iPlaceID, $housenumber)";
 		if (!$bRaw) $sSQL .= " WHERE isaddress OR type = 'country_code'";