From 98214867894eba512bf47cba3439ccba3968f49b Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 22 Nov 2010 21:12:02 +0100
Subject: Render metadata when needed

This changes fundamentally when metadata is rendered. This commit
introduces a new cache file for every page that just contains a
timestamp and is updated whenever the metadata of that page is rendered.

Metadata is rendered when p_get_metadata is called and the last
rendering has been before a page, metadata, configuration or renderer
update or purge is set like in the xhtml renderer cache.

Metadata is no longer automatically rendered when the xhtml renderer
cache isn't used but will still be rendered when needed as
p_get_metadata is called in the cache.

Metadata is also no longer rendered in the indexer script when missing
as that is already done by pageinfo() before anything else is done so
the indexer script won't be called when there is no metadata file.
---
 inc/cache.php       | 31 ++++++-------------------------
 inc/parserutils.php | 23 +++++++++++++++++++----
 2 files changed, 25 insertions(+), 29 deletions(-)

(limited to 'inc')

diff --git a/inc/cache.php b/inc/cache.php
index 571b314cd..ff78e37ae 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -197,18 +197,6 @@ class cache_parser extends cache {
 }
 
 class cache_renderer extends cache_parser {
-
-    function useCache($depends=array()) {
-        $use = parent::useCache($depends);
-
-        // meta data needs to be kept in step with the cache
-        if (!$use && isset($this->page)) {
-            p_set_metadata($this->page,array(),true);
-        }
-
-        return $use;
-    }
-
     function _useCache() {
         global $conf;
 
@@ -251,19 +239,12 @@ class cache_renderer extends cache_parser {
         if (isset($this->page)) {
 
             $metafile = metaFN($this->page,'.meta');
-            if (@file_exists($metafile)) {
-                $files[] = $metafile;                                       // ... the page's own metadata
-                $files[] = DOKU_INC.'inc/parser/metadata.php';              // ... the metadata renderer
-
-                $valid = p_get_metadata($this->page, 'date valid');
-                if (!empty($valid['age'])) {
-                    $this->depends['age'] = isset($this->depends['age']) ?
-                        min($this->depends['age'],$valid['age']) : $valid['age'];
-                }
-
-            } else {
-                $this->depends['purge'] = true;                             // ... purging cache will generate metadata
-                return;
+            $files[] = $metafile;                                       // ... the page's own metadata
+
+            $valid = p_get_metadata($this->page, 'date valid');         // for xhtml this will render the metadata if needed
+            if (!empty($valid['age'])) {
+                $this->depends['age'] = isset($this->depends['age']) ?
+                    min($this->depends['age'],$valid['age']) : $valid['age'];
             }
         }
 
diff --git a/inc/parserutils.php b/inc/parserutils.php
index a50e3f4f3..d4f55a6e4 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -221,6 +221,7 @@ function p_get_instructions($text){
  * returns the metadata of a page
  *
  * @author Esther Brunner <esther@kaffeehaus.ch>
+ * @author Michael Hamann <michael@content-space.de>
  */
 function p_get_metadata($id, $key='', $render=false){
     global $ID;
@@ -231,10 +232,24 @@ function p_get_metadata($id, $key='', $render=false){
     $cache = ($ID == $id);
     $meta = p_read_metadata($id, $cache);
 
-    // metadata has never been rendered before - do it! (but not for non-existent pages)
-    if ($render && !isset($meta['current']['description']['abstract']) && page_exists($id)){
-        $meta = p_render_metadata($id, $meta);
-        p_save_metadata($id, $meta);
+    // prevent recursive calls in the cache
+    static $recursion = false;
+    if (!$recursion){
+        $recursion = true;
+
+        $cachefile = new cache_renderer($id, wikiFN($id), 'metadata');
+
+        if (page_exists($id) && !$cachefile->useCache()){
+            $meta = p_render_metadata($id, $meta);
+            if (p_save_metadata($id, $meta)) {
+                // store a timestamp in order to make sure that the cachefile is touched
+                $cachefile->storeCache(time());
+            } else {
+                msg('Unable to save metadata file. Hint: disk full; file permissions; safe_mode setting.',-1);
+            }
+        }
+
+        $recursion = false;
     }
 
     $val = $meta['current'];
-- 
cgit v1.2.3