introduce Result class in Geocode and SearchDescription

[nominatim.git] / website / deletable.php
diff --git a/website/deletable.php b/website/deletable.php

index 4e2e623c3c43a8f2834bd4bf9cb55dc5f009913b..95000032f390aa841aab19b33cab6fbaf3751f7c 100755 (executable)
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,20 +1,26 @@
  <?php
  <?php
-        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
-        require_once(CONST_BasePath.'/lib/log.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>
  ?>
  <!DOCTYPE html>
  <html>
@@ -31,33 +37,33 @@
  <body>
  <style type="text/css">
  table {
  <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 {
  }
  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 {
  }
  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>
  
  }
  </style>
  
@@ -65,34 +71,32 @@ table td {
  
  <table>
  <?php
  
  <table>
  <?php
-       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)
-                       {
+
+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':
              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;
-                       }
-               }
-               echo "</tr>";
-       }
+                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>
  
  ?>
  </table>