CVS: phpwiki/lib/WikiDB/backend PearDB.php,1.84,1.85

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7201/lib/WikiDB/backend

Modified Files:
        PearDB.php 
Log Message:
support DATABASE_PERSISTENT besides dsn database?persistent=false; move 
lock_count up (per Charles Corrigan)

Index: PearDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -2 -b -p -d -r1.84 -r1.85
--- PearDB.php  18 Jan 2005 20:55:47 -0000      1.84
+++ PearDB.php  25 Jan 2005 08:03:35 -0000      1.85
@@ -43,8 +43,11 @@ extends WikiDB_backend
         $this->_dsn = $dbparams['dsn'];
        $this->_dbparams = $dbparams;
-        $dboptions = array('persistent' => true,
+        $this->_lock_count = 0;
+
+        // persistent is usually a DSN option: we override it with a config 
value.
+        //   phptype://username:password@hostspec/database?persistent=false
+        $dboptions = array('persistent' => DATABASE_PERSISTENT,
                            'debug' => 2);
-        if (preg_match('/^pgsql/',$this->_dsn))
-            $dboptions['persistent'] = false;
+        //if (preg_match('/^pgsql/', $this->_dsn)) $dboptions['persistent'] = 
false;
         $this->_dbh = DB::connect($this->_dsn, $dboptions);
         $dbh = &$this->_dbh;
@@ -78,5 +81,4 @@ extends WikiDB_backend
                     'iscontent'    => "content<>''");
         
-        $this->_lock_count = 0;
     }
     
@@ -1220,4 +1222,7 @@ extends WikiDB_backend_search
 
 // $Log$
+// Revision 1.85  2005/01/25 08:03:35  rurban
+// support DATABASE_PERSISTENT besides dsn database?persistent=false; move 
lock_count up (per Charles Corrigan)
+//
 // Revision 1.84  2005/01/18 20:55:47  rurban
 // reformatting and two bug fixes: adding missing parens



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl