]> git.openstreetmap.org Git - nominatim.git/blobdiff - website/deletable.php
Merge remote-tracking branch 'upstream/master'
[nominatim.git] / website / deletable.php
index 6521e774442e9a97b5cefdf89559581629e0313b..95000032f390aa841aab19b33cab6fbaf3751f7c 100755 (executable)
@@ -1,65 +1,69 @@
 <?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');
 
-       $sOutputFormat = 'html';
-       ini_set('memory_limit', '200M');
+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');
 
-       $oDB =& getDB();
+$sOutputFormat = 'html';
 
-       $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))
-       {
-               failInternalError("Could not get list of deleted OSM elements.", $sSQL, $aPolygons);
-       }
+$oDB =& getDB();
+
+$sSQL = "select placex.place_id, country_code,";
+$sSQL .= " name->'name' as name, i.* from placex, import_polygon_delete i";
+$sSQL .= " where placex.osm_id = i.osm_id and placex.osm_type = i.osm_type";
+$sSQL .= " and placex.class = i.class and placex.type = i.type";
+$aPolygons = chksql($oDB->getAll($sSQL), "Could not get list of deleted OSM elements.");
+
+if (CONST_Debug) {
+    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>
 
 <body>
 <style type="text/css">
 table {
-       border-width: 1px;
-       border-spacing: 0px;
-       border-style: solid;
-       border-color: gray;
-       border-collapse: collapse;
-       background-color: white;
-       margin: 10px;
+    border-width: 1px;
+    border-spacing: 0px;
+    border-style: solid;
+    border-color: gray;
+    border-collapse: collapse;
+    background-color: white;
+    margin: 10px;
 }
 table th {
-       border-width: 1px;
-       padding: 2px;
-       border-style: inset;
-       border-color: gray;
-       border-left-color: #ddd;
-       border-right-color: #ddd;
-       background-color: #eee;
-       -moz-border-radius: 0px 0px 0px 0px;
+    border-width: 1px;
+    padding: 2px;
+    border-style: inset;
+    border-color: gray;
+    border-left-color: #ddd;
+    border-right-color: #ddd;
+    background-color: #eee;
+    -moz-border-radius: 0px 0px 0px 0px;
 }
 table td {
-       border-width: 1px;
-       padding: 2px;
-       border-style: inset;
-       border-color: gray;
-       border-left-color: #ddd;
-       border-right-color: #ddd;
-       background-color: white;
-       -moz-border-radius: 0px 0px 0px 0px;
+    border-width: 1px;
+    padding: 2px;
+    border-style: inset;
+    border-color: gray;
+    border-left-color: #ddd;
+    border-right-color: #ddd;
+    background-color: white;
+    -moz-border-radius: 0px 0px 0px 0px;
 }
 </style>
 
@@ -67,34 +71,32 @@ table td {
 
 <table>
 <?php
-       if (!$aPolygons) exit;
-       echo "<tr>";
-//var_dump($aPolygons[0]);
-       foreach($aPolygons[0] as $sCol => $sVal)
-       {
-               echo "<th>".$sCol."</th>";
-       }
-       echo "</tr>";
-       foreach($aPolygons as $aRow)
-       {
-               echo "<tr>";
-               foreach($aRow as $sCol => $sVal)
-               {
-                       switch($sCol)
-                       {
-                               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>";
-       }
+
+if (!$aPolygons) exit;
+echo "<tr>";
+// var_dump($aPolygons[0]);
+foreach ($aPolygons[0] as $sCol => $sVal) {
+    echo "<th>".$sCol."</th>";
+}
+echo "</tr>";
+foreach ($aPolygons as $aRow) {
+    echo "<tr>";
+    foreach ($aRow as $sCol => $sVal) {
+        switch ($sCol) {
+            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>";
+}
+
 ?>
 </table>