X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cc24d998e48925bd43730342b0428986f7a51ec8..0698757e6e04e2a875ebd345b07d19f263fa4084:/website/deletable.php
diff --git a/website/deletable.php b/website/deletable.php
old mode 100755
new mode 100644
index 4e2e623c..ac4294ba
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,20 +1,26 @@
'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 = new Nominatim\DB();
+$oDB->connect();
+
+$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 = $oDB->getAll($sSQL, null, 'Could not get list of deleted OSM elements.');
+
+if (CONST_Debug) {
+ var_dump($aPolygons);
+ exit;
+}
-//var_dump($aPolygons);
?>
@@ -31,33 +37,33 @@
@@ -65,34 +71,32 @@ table td {
";
-//var_dump($aPolygons[0]);
- foreach($aPolygons[0] as $sCol => $sVal)
- {
- echo "| ".$sCol." | ";
- }
- echo "";
- foreach($aPolygons as $aRow)
- {
- echo "";
- foreach($aRow as $sCol => $sVal)
- {
- switch($sCol)
- {
+
+if (!$aPolygons) exit;
+echo '
';
+// var_dump($aPolygons[0]);
+foreach ($aPolygons[0] as $sCol => $sVal) {
+ echo '| '.$sCol.' | ';
+}
+echo '
';
+foreach ($aPolygons as $aRow) {
+ echo '';
+ foreach ($aRow as $sCol => $sVal) {
+ switch ($sCol) {
case 'osm_id':
- $sOSMType = ($aRow['osm_type'] == 'N'?'node':($aRow['osm_type'] == 'W'?'way':($aRow['osm_type'] == 'R'?'relation':'')));
- echo '| '.$sVal.' | ';
- break;
- case 'place_id':
- echo ''.$sVal.' | ';
- break;
- default:
- echo "".($sVal?$sVal:' ')." | ";
- break;
- }
- }
- echo "
";
- }
+ echo ''.osmLink($aRow).' | ';
+ break;
+ case 'place_id':
+ echo ''.detailsLink($aRow).' | ';
+ break;
+ default:
+ echo ''.($sVal?$sVal:' ').' | ';
+ break;
+ }
+ }
+ echo '';
+}
+
?>