X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/78a29b5a876d0c7d4c8b9ccab9f45b15780b4a22..93ddd4623133f1f7b721ea432873865d6e79ddc9:/website/deletable.php
diff --git a/website/deletable.php b/website/deletable.php
old mode 100755
new mode 100644
index 5d6ee15d..2d7ee7e9
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,102 +1,30 @@
getSet('format', array('html', 'json'), 'html');
+set_exception_handler_by_format($sOutputFormat);
- $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 = new Nominatim\DB();
+$oDB->connect();
-//var_dump($aPolygons);
-?>
-
-
-
-
-
-
- Nominatim Deleted Data
-
-
+$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.');
-
-
-
-
-Objects in this table have been deleted in OSM but are still in the Nominatim database.
-
-
-";
-//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 "
";
- }
-?>
-
-
-
-
-
-
+if ($sOutputFormat == 'json') {
+ echo javascript_renderData($aPolygons);
+} else {
+ include(CONST_BasePath.'/lib/template/deletable-html.php');
+}