From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 18 Mar 2012 17:23:11 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/twain47/Nominatim
X-Git-Tag: deploy~707
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/7c6a88295f8d33688c5a178fd5e6b317b000d91f?ds=inline

Merge branch 'master' of http://github.com/twain47/Nominatim
---

7c6a88295f8d33688c5a178fd5e6b317b000d91f
diff --cc website/search.php
index fd91f31d,50d009e1..a049f07e
--- a/website/search.php
+++ b/website/search.php
@@@ -795,13 -786,8 +792,12 @@@
  								$aViewBoxPlaceIDs = $oDB->getAll($sSQL);
  								if (PEAR::IsError($aViewBoxPlaceIDs))
  								{
- 									var_dump($sSQL, $aViewBoxPlaceIDs);					
- 									exit;
+ 									failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs);
  								}
 +								if (time() - $iStartTime > 60) {
 +									file_put_contents(CONST_BasePath.'/log/long_queries.log', date('Y-m-d H:i:s', $iStartTime).' '.$sSQL."\n", FILE_APPEND);
 +								}
 +
  //var_dump($aViewBoxPlaceIDs);
  								// Did we have an viewbox matches?
  								$aPlaceIDs = array();