Merge pull request #1358 from mtmail/travis-php-7dot1

[nominatim.git] / website / deletable.php

diff --git a/website/deletable.php b/website/deletable.php
old mode 100755 (executable)
new mode 100644 (file)
index 6e9178e..ac4294b
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,6 +1,5 @@
 <?php
 
 <?php
 

-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');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/output.php');


@@ -8,13 +7,14 @@ ini_set('memory_limit', '200M');
 
 $sOutputFormat = 'html';
 
 
 $sOutputFormat = 'html';
 

-$oDB =& getDB();
+$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';
 
 $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.');
+$aPolygons = $oDB->getAll($sSQL, null, 'Could not get list of deleted OSM elements.');

 
 if (CONST_Debug) {
     var_dump($aPolygons);
 
 if (CONST_Debug) {
     var_dump($aPolygons);