[TWiki-Dev] [SVN] MichaelDaum r15971 - in twiki/branches/MAIN/twikiplugins/DBCachePlugin: data/TWiki lib/TWiki/Plugins lib/TWiki/Plugins/DBCachePlugin

[<de...@de...>]

Author: MichaelDaum
Date: 2007-12-11 09:26:18 -0600 (Tue, 11 Dec 2007)
New Revision: 15971
Trac url: http://develop.twiki.org/trac/changeset/15971

Modified:
   twiki/branches/MAIN/twikiplugins/DBCachePlugin/data/TWiki/DBCachePlugin.txt
   twiki/branches/MAIN/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin.pm
   twiki/branches/MAIN/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin/Core.pm
Log:
Item5115: renamed PAGETITLE to TOPICTITLE



Modified: twiki/branches/MAIN/twikiplugins/DBCachePlugin/data/TWiki/DBCachePlugin.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/DBCachePlugin/data/TWiki/DBCachePlugin.txt	2007-12-11 07:00:30 UTC (rev 15970)
+++ twiki/branches/MAIN/twikiplugins/DBCachePlugin/data/TWiki/DBCachePlugin.txt	2007-12-11 15:26:18 UTC (rev 15971)
@@ -316,10 +316,15 @@
 them from left to right, outside to inside:  the first group matches the
 compete pattern, the second the month the third the year.
 
----+++ PAGETITLE
+---+++ TOPICTITLE
 derive the title of a topic from a couple of properties:
-   * from a PAGETITLE preference variable, or
-   * from a "Title" formfield attribute, or
+
+*Syntax:*
+| *%<nop>TOPICTITLE{"&lt;topic>"}%* ||
+| =&lt;topic>= | topic we want the page title off, defaults to current topic |
+
+   * from a TOPICTITLE preference variable, or
+   * from a "TopicTitle" formfield attribute, or
    * defaults to the topic name
 
 ---++ Perl API
@@ -414,8 +419,9 @@
 |  Plugin Author: | TWiki:Main.MichaelDaum |
 |  Copyright &copy;: | 2005-2007, Michael Daum http://wikiring.de |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Plugin Version: | v1.70 |
+|  Plugin Version: | v1.71 |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  11 Dec 2007: | renamed PAGETITLE to TOPICTITLE, matching formfield <nop>TopicTitle |
 |  07 Dec 2007: | added PAGETITLE, defaulting to BASEWEB instead of INCLUDINGWEB in all of the tags |
 |  14 Nov 2007: | protect against data store pollution, at least don't die |
 |  12 Sep 2007: | made significant speedups to DBQuery \
@@ -482,4 +488,4 @@
 |  Feedback: | TWiki:Plugins/%TOPIC%Dev |
 |  Appraisal: | TWiki:Plugins/%TOPIC%Appraisal |
 
--- TWiki:Main.MichaelDaum - 07 Dec 2007
+-- TWiki:Main.MichaelDaum - 11 Dec 2007

Modified: twiki/branches/MAIN/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin/Core.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin/Core.pm	2007-12-11 07:00:30 UTC (rev 15970)
+++ twiki/branches/MAIN/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin/Core.pm	2007-12-11 15:26:18 UTC (rev 15971)
@@ -67,26 +67,31 @@
 }
 
 ###############################################################################
-sub handlePAGETITLE {
+sub handleTOPICTITLE {
   my ($session, $params, $theTopic, $theWeb) = @_;
 
-  my $pageTitle = TWiki::Func::getPreferencesValue("PAGETITLE");
+  my $thisTopic = $params->{_DEFAULT} || $params->{topic} || $baseTopic;
+  my $thisWeb = $params->{web} || $baseWeb;
+
+  ($thisWeb, $thisTopic) = TWiki::Func::normalizeWebTopicName($thisWeb, $thisTopic);
+
+  my $pageTitle = TWiki::Func::getPreferencesValue("TOPICTITLE");
   return $pageTitle if $pageTitle;
 
-  my $db = getDB($baseWeb);
-  return $baseTopic unless $db;
+  my $db = getDB($thisWeb);
+  return $thisTopic unless $db;
 
-  my $topicObj = $db->fastget($baseTopic);
-  return $baseTopic unless $topicObj;
+  my $topicObj = $db->fastget($thisTopic);
+  return $thisTopic unless $topicObj;
 
   my $form = $topicObj->fastget('form');
-  return $baseTopic unless $form;
+  return $thisTopic unless $form;
 
   my $formObj = $topicObj->fastget($form);
-  return $baseTopic unless $formObj;
+  return $thisTopic unless $formObj;
 
-  my $title = $formObj->fastget('Title');
-  return $baseTopic unless $title;
+  my $title = $formObj->fastget('TopicTitle');
+  return $thisTopic unless $title;
 
   return $title;
 }

Modified: twiki/branches/MAIN/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin.pm	2007-12-11 07:00:30 UTC (rev 15970)
+++ twiki/branches/MAIN/twikiplugins/DBCachePlugin/lib/TWiki/Plugins/DBCachePlugin.pm	2007-12-11 15:26:18 UTC (rev 15971)
@@ -27,7 +27,7 @@
 );
 
 $VERSION = '$Rev$';
-$RELEASE = '1.70';
+$RELEASE = '1.71';
 $NO_PREFS_IN_TOPIC = 1;
 $SHORTDESCRIPTION = 'Lightweighted frontend to the DBCacheContrib';
 
@@ -47,7 +47,7 @@
   TWiki::Func::registerTagHandler('DBDUMP', \&_DBDUMP); # for debugging
   TWiki::Func::registerTagHandler('DBRECURSE', \&_DBRECURSE);
   TWiki::Func::registerTagHandler('ATTACHMENTS', \&_ATTACHMENTS);
-  TWiki::Func::registerTagHandler('PAGETITLE', \&_PAGETITLE);
+  TWiki::Func::registerTagHandler('TOPICTITLE', \&_TOPICTITLE);
 
   TWiki::Func::registerRESTHandler('UpdateCache', \&updateCache );
 
@@ -117,9 +117,9 @@
   initCore();
   return TWiki::Plugins::DBCachePlugin::Core::handleDBRECURSE(@_);
 }
-sub _PAGETITLE {
+sub _TOPICTITLE {
   initCore();
-  return TWiki::Plugins::DBCachePlugin::Core::handlePAGETITLE(@_);
+  return TWiki::Plugins::DBCachePlugin::Core::handleTOPICTITLE(@_);
 }
 
 ###############################################################################