X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/cc24d998e48925bd43730342b0428986f7a51ec8..5464dec0570c2451d8607bc739c6f2b6f298bb75:/website/deletable.php

diff --git a/website/deletable.php b/website/deletable.php
index 4e2e623c..c55cb20f 100755
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,30 +1,33 @@
 <?php
-        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
-        require_once(CONST_BasePath.'/lib/log.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-website.php');
+	require_once(CONST_BasePath.'/lib/log.php');
+	require_once(CONST_BasePath.'/lib/output.php');
+	ini_set('memory_limit', '200M');
 
 	$sOutputFormat = 'html';
-	ini_set('memory_limit', '200M');
 
 	$oDB =& getDB();
 
 	$sSQL = "select placex.place_id, calculated_country_code as country_code, name->'name' as name, i.* from placex, import_polygon_delete i where placex.osm_id = i.osm_id and placex.osm_type = i.osm_type and placex.class = i.class and placex.type = i.type";
-	$aPolygons = $oDB->getAll($sSQL);
-	if (PEAR::isError($aPolygons))
+	$aPolygons = chksql($oDB->getAll($sSQL),
+	                    "Could not get list of deleted OSM elements.");
+
+	if (CONST_DEBUG)
 	{
-		failInternalError("Could not get list of deleted OSM elements.", $sSQL, $aPolygons);
+		var_dump($aPolygons);
+		exit;
 	}
-
-//var_dump($aPolygons);
 ?>
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
-    
-    <title>Nominatim Deleted Data</title>
-    
-    <meta name="description" content="List of OSM data that has been deleted" lang="en-US" />
+	<meta charset="utf-8"/>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+	
+	<title>Nominatim Deleted Data</title>
+	
+	<meta name="description" content="List of OSM data that has been deleted" lang="en-US" />
 
 </head>
 
@@ -65,6 +68,7 @@ table td {
 
 <table>
 <?php
+	if (!$aPolygons) exit;
 	echo "<tr>";
 //var_dump($aPolygons[0]);
 	foreach($aPolygons[0] as $sCol => $sVal)
@@ -79,16 +83,15 @@ table td {
 		{
 			switch($sCol)
 			{
-            case 'osm_id':
-                $sOSMType = ($aRow['osm_type'] == 'N'?'node':($aRow['osm_type'] == 'W'?'way':($aRow['osm_type'] == 'R'?'relation':'')));
-                echo '<td><a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$sVal.'" target="_new">'.$sVal.'</a></td>';
-                                break;
-			case 'place_id':
-				echo '<td><a href="'.CONST_Website_BaseURL.'details?place_id='.$sVal.'">'.$sVal.'</a></td>';
-				break;
-			default:
-				echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
-				break;
+				case 'osm_id':
+					echo '<td>'.osmLink($aRow).'</td>';
+					break;
+				case 'place_id':
+					echo '<td>'.detailsLink($aRow).'</td>';
+					break;
+				default:
+					echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
+					break;
 			}
 		}
 		echo "</tr>";
