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.
---
 lib/exe/indexer.php | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)

(limited to 'lib/exe/indexer.php')

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 3fa81715b..bf5bad2e7 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -34,7 +34,6 @@ $tmp = array(); // No event data
 $evt = new Doku_Event('INDEXER_TASKS_RUN', $tmp);
 if ($evt->advise_before()) {
   runIndexer() or
-  metaUpdate() or
   runSitemapper() or
   sendDigest() or
   runTrimRecentChanges() or
@@ -174,51 +173,6 @@ function runIndexer(){
     return true;
 }
 
-/**
- * Will render the metadata for the page if not exists yet
- *
- * This makes sure pages which are created from outside DokuWiki will
- * gain their data when viewed for the first time.
- */
-function metaUpdate(){
-    global $ID;
-    print "metaUpdate(): started".NL;
-
-    if(!$ID) return false;
-    $file = metaFN($ID, '.meta');
-    echo "meta file: $file".NL;
-
-    // rendering needed?
-    if (@file_exists($file)) return false;
-    if (!page_exists($ID)) return false;
-
-    global $conf;
-
-    // gather some additional info from changelog
-    $info = io_grep($conf['changelog'],
-                    '/^(\d+)\t(\d+\.\d+\.\d+\.\d+)\t'.preg_quote($ID,'/').'\t([^\t]+)\t([^\t\n]+)/',
-                    0,true);
-
-    $meta = array();
-    if(!empty($info)){
-        $meta['date']['created'] = $info[0][1];
-        foreach($info as $item){
-            if($item[4] != '*'){
-                $meta['date']['modified'] = $item[1];
-                if($item[3]){
-                    $meta['contributor'][$item[3]] = $item[3];
-                }
-            }
-        }
-    }
-
-    $meta = p_render_metadata($ID, $meta);
-    p_save_metadata($ID, $meta);
-
-    echo "metaUpdate(): finished".NL;
-    return true;
-}
-
 /**
  * Builds a Google Sitemap of all public pages known to the indexer
  *
-- 
cgit v1.2.3


From e3776c06c37cc197709dac60892604dfea894ac2 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 29 Nov 2010 01:34:36 +0100
Subject: Remove enc=utf-8 in VIM modeline as it is not allowed in VIM 7.3

As of VIM 7.3 it is no longer possible to specify the encoding in the
modeline. This gives an error message whenever such a file is opened,
thus this commit removes the enc setting from the modeline.
---
 lib/exe/indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/exe/indexer.php')

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index bf5bad2e7..58b0d0787 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -302,6 +302,6 @@ function sendGIF(){
     // Thinks it's got the whole image
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
 // No trailing PHP closing tag - no output please!
 // See Note at http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php
-- 
cgit v1.2.3


From 1b052f5cb72bee256af579602cbbed59492b2759 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 16 Jan 2011 19:29:03 +0100
Subject: increase indexer version to reforce rebuild for the new title index

---
 lib/exe/indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/exe/indexer.php')

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 58b0d0787..eec8c968c 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -12,7 +12,7 @@ session_write_close();  //close session
 if(!defined('NL')) define('NL',"\n");
 
 // Version tag used to force rebuild on upgrade
-define('INDEXER_VERSION', 2);
+define('INDEXER_VERSION', 3);
 
 // keep running after browser closes connection
 @ignore_user_abort(true);
-- 
cgit v1.2.3