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

diff --cc sql/functions.sql
Simple merge

diff --cc website/reverse.php
Simple merge

diff --cc website/search.php
index fd91f31daff2831f349c0b5f5ce8725c306b1436,50d009e1a75e46e2c71362e63714a007895eed98..a049f07e6c4b5f7702f4148aa58fbeb74c510577
--- 1/website/search.php
--- 2/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();