Changeset 1554 for branches/release-32/lib/MT/Template/ContextHandlers.pm

Timestamp:

03/24/08 03:27:57 (20 months ago)

Author:

takayama

Message:

Implemented fbz:68986
* Implemented UI for session cache
* Implemented php side

Files:

• branches/release-32/lib/MT/Template/ContextHandlers.pm (modified) (2 diffs)

branches/release-32/lib/MT/Template/ContextHandlers.pm

@@ -2284 +2284 @@
         && ($arg->{ssi} || $tmpl->include_with_ssi) ? 1 : 0;
 
-    # If option provided, read from cache
-    my $cache_key = $arg->{key};
-    my $ttl       = $arg->{ttl} || 0;
-    if ($cache_key) {
-        require MT::Session;
-        my $terms = { id => $cache_key, kind => 'CO' };
-        my $cache = $ttl ? MT::Session::get_unexpired_value($ttl, $terms)
-                  :        MT::Session->load($terms)
-                  ;
-        if ($cache) {
-            return $cache->data() if !$use_ssi;
-
-            my $include_name = $cache_key || $tmpl_name;
+    # Try to read from cache
+    my $cache_enabled = $blog && $blog->include_cache
+        && ($arg->{cache} || $arg->{key} || (exists $arg->{ttl})) ? 1 : 0;
+    my $cache_key = $arg->{key} ? $arg->{key}
+        : 'blog::' . $blog_id . '::template_' . $type  . '::' . $tmpl_name;
+    my $ttl       = exists $arg->{ttl} ? $arg->{ttl} : 60 * 60; # default 60 min.
+    my $cache_driver;
+    if ($cache_enabled) {
+        require MT::Cache::Negotiate;
+        $cache_driver = MT::Cache::Negotiate->new( ttl => $ttl );
+        my $cache_value = $cache_driver->get($cache_key);
+
+       if ($cache_value) {
+            return $cache_value if !$use_ssi;
+
+            my $include_name = $arg->{key} || $tmpl_name;
             # The template may still be cached from before we were using SSI
             # for this template, so check that it's also on disk.
@@ -2325 +2328 @@
     }
 
-    if ($cache_key) {
-        my $cache = MT::Session->load({
-            id   => $cache_key,
-            kind => 'CO',
-        });
-        $cache->remove() if $cache;
-        $cache = MT::Session->new;
-        $cache->set_values({
-            id    => $cache_key,
-            kind  => 'CO',
-            start => time,
-            data  => $ret,
-        });
-        $cache->save();
+    if ($cache_enabled) {
+        $cache_driver->replace($cache_key, $ret, $ttl);
     }