add wrapper calls for all nominatim tool functions

[nominatim.git] / lib / DB.php

diff --git a/lib/DB.php b/lib/DB.php
index 38b3e27ec8102f5ce8daca912a263ee62a311a3d..0454a0ff6190567f57acd6d19f46817759ebf7b4 100644 (file)
--- a/lib/DB.php
+++ b/lib/DB.php
@@ -2,7 +2,7 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once(CONST_BasePath.'/lib/DatabaseError.php');
+require_once(CONST_LibDir.'/DatabaseError.php');

 
 /**
  * Uses PDO to access the database specified in the CONST_Database_DSN
 
 /**
  * Uses PDO to access the database specified in the CONST_Database_DSN


@@ -12,9 +12,9 @@ class DB
 {
     protected $connection;
 
 {
     protected $connection;
 

-    public function __construct($sDSN = CONST_Database_DSN)
+    public function __construct($sDSN = null)

     {
     {

-        $this->sDSN = $sDSN;
+        $this->sDSN = $sDSN ?? getSetting('DATABASE_DSN');

     }
 
     public function connect($bNew = false, $bPersistent = true)
     }
 
     public function connect($bNew = false, $bPersistent = true)