[limb-svn] r6920 - 3.x/trunk/limb/cache/src

[svn at limb-project.com]

Author: vasiatka
Date: 2008-04-11 08:28:37 +0400 (Fri, 11 Apr 2008)
New Revision: 6920
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6920

Modified:
   3.x/trunk/limb/cache/src/lmbCacheFileWithMetaBackend.class.php
Log:
--Now property raw is stored in file $key.meta

Modified: 3.x/trunk/limb/cache/src/lmbCacheFileWithMetaBackend.class.php
===================================================================
--- 3.x/trunk/limb/cache/src/lmbCacheFileWithMetaBackend.class.php	2008-04-10 19:31:40 UTC (rev 6919)
+++ 3.x/trunk/limb/cache/src/lmbCacheFileWithMetaBackend.class.php	2008-04-11 04:28:37 UTC (rev 6920)
@@ -38,23 +38,8 @@
     if (file_exists($file))
       return false;
 
-    if(array_key_exists("ttl", $params))
-    {
-    	$meta=array('ttl' => $params['ttl']+time());
-    	$this->_setMetaData($key,$meta);
-    }
+    return $this->_doSet($key,$value,$file, $params);
 
-    if (array_key_exists("raw", $params))
-    {
-      lmbFs :: safeWrite($file, $value);
-      return true;
-    }
-    else
-    {
-      $container = new lmbSerializable($value);
-      lmbFs :: safeWrite($file, serialize($container));
-      return true;
-    }
   }
 
   function set($key, $value, $params = array())
@@ -63,13 +48,25 @@
 
     $file = $this->getCacheDir() . '/' . $this->_getCacheFileName($key);
 
-   if(isset($params['ttl']))
-    {
-    	$meta=array('ttl' => $params['ttl']+time());
-    	$this->_setMetaData($key,$meta);
+    return $this->_doSet($key,$value,$file, $params);
+  }
+
+  function _doSet($key,$value,$file, $params)
+  {
+  	if(isset($params['ttl']))
+    {
+    	$meta['ttl']=$params['ttl']+time();
     }
+  	if(isset($params['raw'])||in_array('raw',$params))
+    {
+    	$meta['raw']=true;
+    }
+    if(isset($meta) and is_array($meta))
+    {
+      $this->_setMetaData($key,$meta);
+    }
 
-    if (array_key_exists("raw", $params))
+    if (isset($meta['raw']))
     {
       lmbFs :: safeWrite($file, $value);
       return true;
@@ -93,7 +90,7 @@
         return false;
     }
 
-    if (array_key_exists("raw", $params))
+    if (isset($meta['raw']))
     {
       return file_get_contents($file);
     }