Changeset 7717

Timestamp:

03/02/08 20:28:31 (1 year ago)

Author:

fabien

Message:

moved partial/component cache management to sfViewCacheManager

Files:

• branches/1.1/lib/plugins/sfCompat10Plugin/lib/helper/PartialHelper.php (modified) (4 diffs)
• branches/1.1/lib/view/sfViewCacheManager.class.php (modified) (1 diff)

branches/1.1/lib/plugins/sfCompat10Plugin/lib/helper/PartialHelper.php

@@ -114 +114 @@
-  {
-    $cacheManager->registerConfiguration($moduleName);
-
-
+
-    {
-      return $retval;
@@ -178 +177 @@
-    if ($cacheManager)
-    {
-_set_cache($cacheManager, $uri
+$cacheManager->setPartialCache($moduleName, $actionName, $vars
-    }
-
@@ -243 +242 @@
-    $cacheManager->registerConfiguration($moduleName);
-    $uri = '@sf_cache_partial?module='.$moduleName.'&action='.$actionName.'&sf_cache_key='.(isset($vars['sf_cache_key']) ? $vars['sf_cache_key'] : md5(serialize($vars)));
-_get_cache($cacheManager, $uri
+$cacheManager->getPartialCache($moduleName, $actionName, $vars
-    {
-      return $retval;
@@ -256 +255 @@
-  if ($cacheManager)
-  {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  }
-

branches/1.1/lib/view/sfViewCacheManager.class.php

@@ -520 +520 @@
-  }
-
+  public function computeCacheKey($parameters)
+  {
+    return isset($parameters['sf_cache_key']) ? $parameters['sf_cache_key'] : md5(serialize($parameters));
+  }
+
+  public function getPartialUri($module, $action, $parameters)
+  {
+    return sprintf('@sf_cache_partial?module=%s&action=%s&sf_cache_key=%s', $module, $action, $this->computeCacheKey($parameters));
+  }
+
+  /**
+   * Returns whether a partial template is in the cache.
+   *
+   * @param  string  The internal URI
+   *
+   * @return Boolean true if a partial is in the cache, false otherwise
+   */
+  public function hasPartialCache($module, $action, $parameters)
+  {
+    return $this->has($this->getPartialUri($module, $action, $parameters));
+  }
+
+  /**
+   * Gets a partial template from the cache.
+   *
+   * @param  string The internal URI
+   *
+   * @return string The cache content
+   */
+  public function getPartialCache($module, $action, $parameters)
+  {
+    $uri = $this->getPartialUri($module, $action, $parameters);
+
+    if (!$this->isCacheable($uri))
+    {
+      return null;
+    }
+
+    // retrieve content from cache
+    $content = $this->get($uri);
+
+    if (is_null($content))
+    {
+      return null;
+    }
+
+    if (sfConfig::get('sf_web_debug'))
+    {
+      $content = sfWebDebug::decorateContentWithDebug($uri, $content, true);
+    }
+
+    return $content;
+  }
+
+  /**
+   * Sets an action template in the cache.
+   *
+   * @param  string The internal URI
+   * @param  string The content to cache
+   * @param  string The view attribute holder to cache
+   *
+   * @return string The cached content
+   */
+  public function setPartialCache($module, $action, $parameters, $content)
+  {
+    $uri = $this->getPartialUri($module, $action, $parameters);
+    if (!$this->isCacheable($uri))
+    {
+      return $content;
+    }
+
+    $saved = $this->set($content, $uri);
+
+    if ($saved && sfConfig::get('sf_web_debug'))
+    {
+      $content = sfWebDebug::decorateContentWithDebug($uri, $content, true);
+    }
+
+    return $content;
+  }
+
-  /**
-   * Returns whether an action template is in the cache.