Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index 4f7336c132b3e4852dc711f7a3ffca13e1ab0c7f..d7c85e7b6df684f850c9e283bc3e2a29195689f9 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -1,15 +1,23 @@
 <?php
        require_once('DB.php');
 
 <?php
        require_once('DB.php');
 

-       // Get the database object
-       $oDB =& DB::connect(CONST_Database_DSN, false);
-       if (PEAR::IsError($oDB))
+       function &getDB($bNew = false, $bPersistent = false)

        {
        {

-               fail($oDB->getMessage(), 'Unable to connect to the database');
+               // Get the database object
+               $oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
+               if (PEAR::IsError($oDB))
+               {
+                       var_dump(CONST_Database_DSN);
+                       var_Dump($oDB);
+                       fail($oDB->getMessage());
+               }
+               $oDB->setFetchMode(DB_FETCHMODE_ASSOC);
+               $oDB->query("SET DateStyle TO 'sql,european'");
+               $oDB->query("SET client_encoding TO 'utf-8'");
+               $iMaxExecution = ini_get('max_execution_time') * 1000;
+               if ($iMaxExecution > 0) $oDB->query("SET statement_timeout TO $iMaxExecution");
+               return $oDB;

        }
        }

-       $oDB->setFetchMode(DB_FETCHMODE_ASSOC);
-       $oDB->query("SET DateStyle TO 'sql,european'");
-       $oDB->query("SET client_encoding TO 'utf-8'");

 
        function getDBQuoted($s)
        {
 
        function getDBQuoted($s)
        {