Merge remote-tracking branch 'upstream/master' into move-mouse-position-info-on-map

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

index 6521e774442e9a97b5cefdf89559581629e0313b..c55cb20f1e531b73406d2aa09fdb1307ccf9f3f2 100755 (executable)
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -3,20 +3,21 @@
         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>