Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / deletable.php

diff --git a/website/deletable.php b/website/deletable.php
index 2d7ee7e9b804db7d94b82a8f5f7227d33dda2248..81fb4f99d35eeefb13ef16bd19f25708f1de0ad3 100644 (file)
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,15 +1,15 @@
 <?php
 
-require_once(CONST_BasePath.'/lib/init-website.php');
-require_once(CONST_BasePath.'/lib/log.php');
-require_once(CONST_BasePath.'/lib/output.php');
+require_once(CONST_LibDir.'/init-website.php');
+require_once(CONST_LibDir.'/log.php');
+require_once(CONST_LibDir.'/output.php');
 ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
-$sOutputFormat = $oParams->getSet('format', array('html', 'json'), 'html');
+$sOutputFormat = $oParams->getSet('format', array('json'), 'json');
 set_exception_handler_by_format($sOutputFormat);
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 $oDB->connect();
 
 $sSQL = 'select placex.place_id, country_code,';
@@ -24,7 +24,5 @@ if (CONST_Debug) {
 }
 
 if ($sOutputFormat == 'json') {
-    echo javascript_renderData($aPolygons);
-} else {
-    include(CONST_BasePath.'/lib/template/deletable-html.php');
+    javascript_renderData($aPolygons);
 }