Item1546: CalendarPlugin issues when included

FIX FOR THE PROBLEM DESCRIBED BELOW:

--- CalendarPlugin.pm-2009-05-01        2009-05-01 16:37:48.000000000 +0000
+++ CalendarPlugin.pm   2009-05-01 16:44:44.000000000 +0000
@@ -453,6 +453,9 @@
     # (don't rely on Foswiki::Func::expandCommonVariables to avoid deep recursion)
     $text =~ s/%INCLUDE{(.*?)}%/&expandIncludedEvents( $1, $options{web}, $options{topic}, () )/geo;
 
+    $text =~ s/%CALENDAR[^%]*%/_WAS_A_CALENDAR_CALL_HERE_/g;
+    $text = TWiki::Func::expandCommonVariables($text, $theTopic, $theWeb);
+
     # Before this was modified to do multiple months, there was a
     # clause to bail out early if there were no events, simply
     # returning a "blank" calendar. However, since the plugin can now

BUGS FOR THE ABOVE FIX

• if a CALENDAR takes data from another CALENDAR using a list mode, it will fail. Just include the same base data and it will work.

PROBLEM DESCRIPTION

If you have dynamic entries in a document, and use this document as the entry source for %CALENDAR%, the dynamic entries will only be displayed when you use %CALENDAR% directly in the same document. If you use it from another document or include the document, the dynamically generated entries will not be seen.

Example

• WebLeftBarExample has

  %CALENDAR{topic="CalendrierActivites" web="Main"}%
  

• WebHome has

  %CALENDAR{topic="CalendrierActivites" aslist="1" days="30" datenumberformat="   * $year-$mo-$day"}%
  

• CalendrierActivites has

     * 1 Wed - [[http://linux-neuchatel.he-arc.ch][linux-ne]]
  %SEARCH{ "^Activite[A-Z0-9]"
                       scope="topic"
                       web="%WEB%"
                       regex="on" nosearch="on" nototal="on" order="modified" reverse="on" limit="100"
                       format="   * $formfield(EventDate) - [[$web.$topic][$formfield(ShortTitle)]]"
  }%
  %CALENDAR{topic="CalendrierActivites" web="Main"}%
  

Results

• only CalendrierActivites when seen directly has all of the entries

(http://www.alphanet.ch:8080/cgi-bin/foswiki/view/Main/WebHome for live example)

---

Had to fix this so I could include calendars from external sources.

-- CrawfordCurrie - 30 Jun 2010