Changeset 4140

Timestamp:

06/15/09 08:47:52 (3 years ago)

Author:

DanielRohde

Message:

Item1652: added missing BASEWEB/BASETOPIC substitutions

File:

• trunk/HolidaylistPlugin/lib/Foswiki/Plugins/HolidaylistPlugin.pm (modified) (4 diffs)

trunk/HolidaylistPlugin/lib/Foswiki/Plugins/HolidaylistPlugin.pm

@@ -48 +48 @@
     );
 
-# This should always be $Rev: 18100 $ so that TWiki can determine the checked-in
+# This should always be $Rev: 18101 $ so that TWiki can determine the checked-in
 # status of the plugin. It is used by the build automation tools, so
 # you should leave it alone.
-$VERSION = '$Rev: 18100 $';
+$VERSION = '$Rev: 18101 $';
 
 # This is a free-form string you can use to "name" your own plugin version.
@@ -1543 +1543 @@
         }
 
+        $text =~ s/%BASETOPIC%/${theTopic}/sg;
+        $text =~ s/%BASEWEB%/${theWeb}/sg;
         $text =~ s/%INCLUDE{(.*?)}%/&expandIncludedEvents($1, \@processedTopics, $web, $topic)/geo;
         $text =~s/\%HOLIDAYLIST({(.*?)})?%//sg;
         $text = Foswiki::Func::expandCommonVariables($text,$web,$topic);
+
         
         return $text;
@@ -1567 +1570 @@
 sub expandIncludedEvents
 {
-        my( $theAttributes, $theProcessedTopicsRef, $theWeb, $theTopic ) = @_;
-
-        my $webTopic = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes ), $theTopic, $theWeb );
-        my $section = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes, 'section'), $theTopic, $theWeb );
-        my $pattern = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes, 'pattern'), $theTopic, $theWeb );
+        my( $theAttributes, $theProcessedTopicsRef, $web, $topic ) = @_;
+
+        my $webTopic = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes ), $topic, $web );
+        my $section = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes, 'section'), $topic, $web );
+        my $pattern = Foswiki::Func::expandCommonVariables( Foswiki::Func::extractNameValuePair( $theAttributes, 'pattern'), $topic, $web );
 
         
         if( $webTopic =~ /^([^\.]+)[\.\/](.*)$/ ) {
-                $theWeb = $1;
-                $theTopic = $2;
+                $web = $1;
+                $topic = $2;
         } else {
-                $theTopic = $webTopic;
+                $topic = $webTopic;
         }
 
         # prevent recursive loop:
-        grep (/^\Q$theWeb.$theTopic\E$/, @{$theProcessedTopicsRef}) and return "";
-
-        push( @{$theProcessedTopicsRef}, "$theWeb.$theTopic" );
-
-        my $text = &readTopicText( $theWeb, $theTopic );
+        grep (/^\Q$web.$topic\E$/, @{$theProcessedTopicsRef}) and return "";
+
+        push( @{$theProcessedTopicsRef}, "$web.$topic" );
+
+        my $text = &readTopicText( $web, $topic );
 
         $text = getTopicSectionText($text, $section) if (defined $section && $section ne "");
@@ -1594 +1597 @@
         $text = getTopicIncludeText($text);
 
+        # fix base topic:
+        $text =~ s/%BASETOPIC%/${theTopic}/sg;
+        $text =~ s/%BASEWEB%/${theWeb}/sg;
+
         # recursively expand includes:
-        $text =~ s/%INCLUDE{(.*?)}%/&expandIncludedEvents( $1, $theProcessedTopicsRef, $theWeb, $theTopic )/geo;
+        $text =~ s/%INCLUDE{(.*?)}%/&expandIncludedEvents( $1, $theProcessedTopicsRef, $web, $topic )/geo;
 
         # expand common variables: