CVS update: /cowiki/htdocs/setup/class/task/

User: dgorski 
Date: 2005/05/05 19:14:48

Modified:
   cowiki/htdocs/setup/class/task/class.TaskFinish.php

Log:
 Code relocation

File Changes:

Directory: /cowiki/htdocs/setup/class/task/
===========================================

File [changed]: class.TaskFinish.php
Url: http://cowiki.tigris.org/source/browse/cowiki/htdocs/setup/class/task/class.TaskFinish.php?r1=1.2&r2=1.3
Delta lines:  +3 -31
--------------------
--- class.TaskFinish.php	29 Apr 2005 22:45:17 -0000	1.2
+++ class.TaskFinish.php	6 May 2005 02:14:46 -0000	1.3
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.TaskFinish.php,v 1.2 2005/04/29 22:45:17 dgorski Exp $
+ * $Id: class.TaskFinish.php,v 1.3 2005/05/06 02:14:46 dgorski Exp $
  *
  * This file is part of coWiki. coWiki is free software under the terms of
  * the GNU General Public License (GPL). Read the LICENSE file. If you did
@@ -17,7 +17,7 @@
  * @author      Daniel T. Gorski, <[email protected]>
  * @copyright   (C) Daniel T. Gorski, {@link http://www.develnet.org}
  * @license     http://www.gnu.org/licenses/gpl.html
- * @version     $Revision: 1.2 $
+ * @version     $Revision: 1.3 $
  *
  */
 
@@ -150,7 +150,7 @@
 
         // [.DOCUMENT] section
         $Conf->setSectionKeyValue(
-            '.DOCUMENT', 'RESOURCE', $this->getDsnResource('.DOCUMENT')
+            '.DOCUMENT', 'RESOURCE', $this->State->getDocumentStorageDSN()
         );
 
         // ----------------------------------------------------------------
@@ -219,34 +219,6 @@
             );
         }
 
-    }
-
-    // --------------------------------------------------------------------
-
-    // Assemble DSN path
-    private function getDsnResource($sType = null) {
-        if ($sType == null) {
-            throw new ConfigSyntaxException('Unknown DSN resource.');
-        }
-
-        $sStr = 'illegal';
-
-        if ($sType == '.DOCUMENT') {
-        
-            $sStr = $this->State->getDocStorageScheme() . '://';
-            $sStr .=  $this->State->getDocStorageConnectorUser();
-            $sStr .=  ':';
-            $sStr .=  $this->State->getDocStorageConnectorPassword();
-            $sStr .=  '@';
-            $sStr .=  $this->State->getDocHost();
-            if ($this->State->getDocHostPort() != '') {
-                $sStr .= ':' . $this->State->getDocHostPort();
-            }
-            $sStr .=  '/';
-            $sStr .=  $this->State->getDocDatabaseName();        
-        }
-
-        return $sStr;
     }
 
 } // of class