CVS update: /cowiki/includes/cowiki/class/core/, /cowiki/includes/cowiki/class/parse/, /cowiki/includes/cowiki/plugin/

User: dgorski 
Date: 2005/04/27 18:22:17

Modified:
   cowiki/includes/cowiki/class/core/class.RuntimeContext.php
   cowiki/includes/cowiki/class/parse/class.RssFeed.php
   cowiki/includes/cowiki/plugin/class.PrivateFrontHistoryDiff.php

Log:
 For FileOutputStream pass the locking strategy that has been defined in the configuration file

File Changes:

Directory: /cowiki/includes/cowiki/class/core/
==============================================

File [changed]: class.RuntimeContext.php
Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/class/core/class.RuntimeContext.php?r1=1.59&r2=1.60
Delta lines:  +12 -5
--------------------
--- class.RuntimeContext.php	13 Apr 2005 04:30:57 -0000	1.59
+++ class.RuntimeContext.php	28 Apr 2005 01:22:15 -0000	1.60
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.RuntimeContext.php,v 1.59 2005/04/13 04:30:57 dgorski Exp $
+ * $Id: class.RuntimeContext.php,v 1.60 2005/04/28 01:22:15 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.59 $
+ * @version     $Revision: 1.60 $
  *
  */
 
@@ -762,11 +762,15 @@
      */
     public function putToCache($Obj, $mData, $sIdent = 'none') {
 
-        if ($this->getRegistry()->get('RUNTIME_CACHE_ENABLE')) {
+        $Registry = $this->getRegistry();
+
+        if ($Registry->get('RUNTIME_CACHE_ENABLE')) {
             $sFile = $this->getTempFileName(get_class($Obj), $sIdent);
 
             try {
-                $Out = new FileOutputStream($sFile);
+                $sLockType = $Registry->get('RUNTIME_LOCKING_METHOD');
+
+                $Out = new FileOutputStream($sFile, false, $sLockType);
                 $Out->write($mData);
                 $Out->close();
 
@@ -822,7 +826,10 @@
         $sFileName = $this->getTempFileNamePath() . $sFileName;
 
         try {
-            $Out = new FileOutputStream($sFileName);
+            $Registry = $this->getRegistry();
+            $sLockType = $Registry->get('RUNTIME_LOCKING_METHOD');
+
+            $Out = new FileOutputStream($sFileName, false, $sLockType);
             $Out->write($sData);
             $Out->close();
 

Directory: /cowiki/includes/cowiki/class/parse/
===============================================

File [changed]: class.RssFeed.php
Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/class/parse/class.RssFeed.php?r1=1.8&r2=1.9
Delta lines:  +7 -3
-------------------
--- class.RssFeed.php	19 Mar 2005 16:37:36 -0000	1.8
+++ class.RssFeed.php	28 Apr 2005 01:22:15 -0000	1.9
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.RssFeed.php,v 1.8 2005/03/19 16:37:36 dgorski Exp $
+ * $Id: class.RssFeed.php,v 1.9 2005/04/28 01:22:15 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      Kai Schröder, <[email protected]>
  * @copyright   (C) Daniel T. Gorski, {@link http://www.develnet.org}
  * @license     http://www.gnu.org/licenses/gpl.html
- * @version     $Revision: 1.8 $
+ * @version     $Revision: 1.9 $
  *
  */
 
@@ -312,7 +312,11 @@
         $sNs .= ">\r\n";
 
         try {
-            $Out = new FileOutputStream($sCowikiRoot . '/' . $sName);
+            $Out = new FileOutputStream(
+                          $sCowikiRoot . '/' . $sName,
+                          false,
+                          $Registry->get('RUNTIME_LOCKING_METHOD')
+                       );
         } catch (IOException $e) {
             throw $e; // rethrow
         }

Directory: /cowiki/includes/cowiki/plugin/
==========================================

File [changed]: class.PrivateFrontHistoryDiff.php
Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/plugin/class.PrivateFrontHistoryDiff.php?r1=1.29&r2=1.30
Delta lines:  +12 -4
--------------------
--- class.PrivateFrontHistoryDiff.php	19 Mar 2005 16:37:36 -0000	1.29
+++ class.PrivateFrontHistoryDiff.php	28 Apr 2005 01:22:15 -0000	1.30
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.PrivateFrontHistoryDiff.php,v 1.29 2005/03/19 16:37:36 dgorski Exp $
+ * $Id: class.PrivateFrontHistoryDiff.php,v 1.30 2005/04/28 01:22:15 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
@@ -32,7 +32,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.29 $
+ * @version     $Revision: 1.30 $
  *
  */
 
@@ -450,7 +450,11 @@
 
         // Write temporary file
         try {
-            $Out = new FileOutputStream($sOrgFile);
+            $Out = new FileOutputStream(
+                          $sOrgFile,
+                          false,
+                          $this->Registry->get('RUNTIME_LOCKING_METHOD')
+                       );
             $Out->write($sStr1);
             $Out->close();
 
@@ -460,7 +464,11 @@
 
         // Write temporary file
         try {
-            $Out = new FileOutputStream($sHistFile);
+            $Out = new FileOutputStream(
+                          $sHistFile,
+                          false,
+                          $this->Registry->get('RUNTIME_LOCKING_METHOD')
+                       );
             $Out->write($sStr2);
             $Out->close();
             $bSuccess2 = true;