Collapse two log tables into one.

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index d9adf6b849088b4a0eef95245087495cf2396eab..a049f07e6c4b5f7702f4148aa58fbeb74c510577 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -163,8 +163,7 @@
                        $sViewboxSmallSQL = $oDB->getOne($sSQL);
                        if (PEAR::isError($sViewboxSmallSQL))
                        {
-                               var_dump($sViewboxSmallSQL);
-                               exit;
+                               failInternalError("Could not get small viewbox.", $sSQL, $sViewboxSmallSQL);
                        }
                        $sViewboxSmallSQL = "'".$sViewboxSmallSQL."'::geometry";
 
@@ -172,8 +171,7 @@
                        $sViewboxLargeSQL = $oDB->getOne($sSQL);
                        if (PEAR::isError($sViewboxLargeSQL))
                        {
-                               var_dump($sViewboxLargeSQL);
-                               exit;
+                               failInternalError("Could not get large viewbox.", $sSQL, $sViewboxLargeSQL);
                        }
                        $sViewboxLargeSQL = "'".$sViewboxLargeSQL."'::geometry";
                }
@@ -312,7 +310,12 @@
                        // Check which tokens we have, get the ID numbers                       
                        $sSQL = 'select word_id,word_token, word, class, type, location, country_code, operator';
                        $sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')';
-                       $sSQL .= ' and (class is null or class not in (\'highway\'))';
+                       // HACK WARNING
+                       // (mis)using search_name_count to exclude words that return too many
+                       // search results. saerch_name_count is currently set to 1 by hand
+                       // because there is no fast way to extract this count from a live database. 
+                       $sSQL .= ' and search_name_count = 0';
+//                     $sSQL .= ' and (class is null or class not in (\'highway\'))';
 //                     $sSQL .= ' group by word_token, word, class, type, location, country_code';
 
                        if (CONST_Debug) var_Dump($sSQL);
@@ -324,8 +327,7 @@
                                $aDatabaseWords = array();
                        if (PEAR::IsError($aDatabaseWords))
                        {
-                               var_dump($sSQL, $aDatabaseWords);
-                               exit;
+                               failInternalError("Could not get word tokens.", $sSQL, $aDatabaseWords);
                        }
                        $aPossibleMainWordIDs = array();
                        foreach($aDatabaseWords as $aToken)
@@ -786,12 +788,16 @@
                                                                        $sSQL .= " limit ".$iLimit;
 
                                                                if (CONST_Debug) var_dump($sSQL);
+                                                               $iStartTime = time();
                                                                $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();
@@ -971,8 +977,7 @@
 
                                                if (PEAR::IsError($aPlaceIDs))
                                                {
-                                                       var_dump($sSQL, $aPlaceIDs);                                    
-                                                       exit;
+                                                       failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs);
                                                }
 
                                                if (CONST_Debug) var_Dump($aPlaceIDs);
@@ -1048,8 +1053,7 @@
 
                                        if (PEAR::IsError($aSearchResults))
                                        {
-                                               var_dump($sSQL, $aSearchResults);                                       
-                                               exit;
+                                               failInternalError("Could not get details for place.", $sSQL, $aSearchResults);
                                        }
                                }
                        } // end if ($sQuery)
@@ -1117,8 +1121,7 @@
 
                                        if (PEAR::IsError($aSearchResults))
                                        {
-                                               var_dump($sSQL, $aSearchResults);                                       
-                                               exit;
+                        failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
                                        }
                                }
                        }
@@ -1149,8 +1152,7 @@
                        $aPointPolygon = $oDB->getRow($sSQL);
                        if (PEAR::IsError($aPointPolygon))
                        {
-                               var_dump($sSQL, $aPointPolygon);
-                               exit;
+                               failInternalError("Could not get outline.", $sSQL, $aPointPolygon);
                        }
                        if ($aPointPolygon['place_id'])
                        {