]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 57ef20c)
return a 500 on database error
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 18 Mar 2012 16:58:19 +0000 (17:58 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 18 Mar 2012 16:58:19 +0000 (17:58 +0100)
lib/lib.php patch | blob | history
website/details.php patch | blob | history
website/reverse.php patch | blob | history
website/search.php patch | blob | history

diff --git a/lib/lib.php b/lib/lib.php
index a7c805f7ddc274c55bef435423a8bf949421d480..d8ff2f64f4762dae493a408d179e5841a2aee038 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -1,5 +1,30 @@
 <?php
 
+       function failInternalError($sError, $sSQL = false, $vDumpVar = false) 
+       {
+               header('HTTP/1.0 500 Internal Server Error');
+               header('Content-type: text/html; charset=utf-8');
+               echo "<html><body><h1>Internal Server Error</h1>";
+               echo '<p>Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.</p>';
+               echo "<p><b>Details:</b> ".$sError,"</p>";
+               echo '<p>Feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above an the URL you used.</p>';
+               if (CONST_Debug)
+               {
+                       echo "<hr><h2>Debugging Information</h2><br>";
+                       if ($sSQL) {
+                               echo "<h3>SQL query</h3><code>".$sSQL."</code>";
+                       }
+                       if ($vDumpVar) {
+                               echo "<h3>Result</h3> <code>";
+                               var_dump($vDumpVar);
+                               echo "</code>";
+                       }
+               }
+               echo "\n</body></html>\n";
+               exit;
+
+       }
+
        function fail($sError, $sUserError = false)
        {
                if (!$sUserError) $sUserError = $sError;
diff --git a/website/details.php b/website/details.php
index 110fdc07a06f01d3cab9fa157162ff735909a475..eeb4865689625652ba2ecef7e63fbd381605b8b5 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -48,11 +48,11 @@
        $sSQL .= " ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea,ST_GeometryType(geometry) as geotype, ST_Y(ST_Centroid(geometry)) as lat,ST_X(ST_Centroid(geometry)) as lon ";
        $sSQL .= " from placex where place_id = $iPlaceID";
        $aPointDetails = $oDB->getRow($sSQL);
-       IF (PEAR::IsError($aPointDetails))
+       if (PEAR::IsError($aPointDetails))
        {
-               var_dump($aPointDetails);
-               exit;
+               failInternalError("Could not get details of place object.", $sSQL, $aPointDetails);
        }
+
         $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
        $fLon = $aPointDetails['lon'];
        $fLat = $aPointDetails['lat'];
@@ -77,8 +77,7 @@
        $aPointPolygon = $oDB->getRow($sSQL);
        IF (PEAR::IsError($aPointPolygon))
        {
-               var_dump($aPointPolygon);
-               exit;
+               failInternalError("Could not get bounding box of place object.", $sSQL, $aPointPolygon);
        }
        if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#',$aPointPolygon['outlinestring'],$aMatch))
        {
diff --git a/website/reverse.php b/website/reverse.php
index f569ffac1abbf6ba9dc82ad33ddcc7acb1f1500f..d9ecc09efc83d022cfb3aa4955357bd12b1eee9b 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -105,8 +105,7 @@
                        $iPlaceID = $aPlace['place_id'];
                        if (PEAR::IsError($iPlaceID))
                        {
-                               var_Dump($sSQL, $iPlaceID); 
-                               exit;
+                               failInternalError("Could not determine closest place.", $sSQL, $iPlaceID); 
                        }
                }
 
@@ -118,8 +117,7 @@
                        $iPlaceID = $oDB->getOne($sSQL);
                        if (PEAR::IsError($iPlaceID))
                        {
-                               var_Dump($sSQL, $iPlaceID); 
-                               exit;
+                               failInternalError("Could not get parent for place.", $sSQL, $iPlaceID); 
                        }
 
                        if ($iPlaceID && $aPlace['place_id'] && $iMaxRank < 28)
@@ -129,8 +127,7 @@
                                $iPlaceID = $oDB->getOne($sSQL);
                                if (PEAR::IsError($iPlaceID))
                                {
-                                       var_Dump($sSQL, $iPlaceID); 
-                                       exit;
+                                       failInternalError("Could not get larger parent for place.", $sSQL, $iPlaceID); 
                                }
                        }
                        if (!$iPlaceID)
diff --git a/website/search.php b/website/search.php
index d9adf6b849088b4a0eef95245087495cf2396eab..50d009e1a75e46e2c71362e63714a007895eed98 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";
                }
@@ -324,8 +322,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)
@@ -789,8 +786,7 @@
                                                                $aViewBoxPlaceIDs = $oDB->getAll($sSQL);
                                                                if (PEAR::IsError($aViewBoxPlaceIDs))
                                                                {
-                                                                       var_dump($sSQL, $aViewBoxPlaceIDs);                                     
-                                                                       exit;
+                                                                       failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs);
                                                                }
 //var_dump($aViewBoxPlaceIDs);
                                                                // Did we have an viewbox matches?
@@ -971,8 +967,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 +1043,7 @@
 
                                        if (PEAR::IsError($aSearchResults))
                                        {
-                                               var_dump($sSQL, $aSearchResults);                                       
-                                               exit;
+                                               failInternalError("Could not get details for place.", $sSQL, $aSearchResults);
                                        }
                                }
                        } // end if ($sQuery)
@@ -1117,8 +1111,7 @@
 
                                        if (PEAR::IsError($aSearchResults))
                                        {
-                                               var_dump($sSQL, $aSearchResults);                                       
-                                               exit;
+                        failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
                                        }
                                }
                        }
@@ -1149,8 +1142,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'])
                        {
Open Source search based on OpenStreetMap data