*** CalendarPlugin.pm	Thu Nov  4 13:15:02 2004
--- lib/TWiki/Plugins/CalendarPlugin.pm	Thu Nov  4 13:21:12 2004
***************
*** 332,351 ****
      # parse events
      my @days = ();
!     my ($descr, $d, $dd, $mm, $yy, $text) =
         ('',     '', '',  '',  '',  ''   );
!     our %months = (  Jan=>1, Feb=>2, Mar=>3, Apr=>4,  May=>5,  Jun=>6,
! 		    Jul=>7, Aug=>8, Sep=>9, Oct=>10, Nov=>11, Dec=>12);
! 	our %wdays = ( Sun=>7, Mon=>1, Tue=>2, Wed=>3, Thu=>4, Fri=>5, Sat=>6);
!     our $days_rx = '[0-9]?[0-9]';
!     our $months_rx = join ('|', keys %months);
!     our $wdays_rx = join ('|', keys %wdays);
!     our $years_rx = '[12][0-9][0-9][0-9]';
!     our $date_rx = "($days_rx)\\s+($months_rx)";
!     our $monthly_rx = "([1-6])\\s+($wdays_rx)";
!     our $full_date_rx = "$date_rx\\s+($years_rx)";
!     our $weekly_rx = "E\\s+($wdays_rx)";
!     our $periodic_rx = "E([0-9]+)\\s+$full_date_rx";
!     our $numdaymon_rx = "([0-9L])\\s+($wdays_rx)\\s+($months_rx)";
!     $text = getTopicText(%options, $theTopic, $theWeb, $refText);
  
      # recursively expand includes
--- 332,352 ----
      # parse events
      my @days = ();
!     my ($descr, $d, $dd, $mm, $yy, $text) = 
         ('',     '', '',  '',  '',  ''   );
!     my %months = (  Jan=>1, Feb=>2, Mar=>3, Apr=>4,  May=>5,  Jun=>6, 
! 		  Jul=>7, Aug=>8, Sep=>9, Oct=>10, Nov=>11, Dec=>12);
!     my %wdays = ( Sun=>7, Mon=>1, Tue=>2, Wed=>3, Thu=>4, Fri=>5, Sat=>6);
!     my $days_rx = '[0-9]?[0-9]';
!     my $months_rx = join ('|', keys %months);
!     my $wdays_rx = join ('|', keys %wdays);
!     my $years_rx = '[12][0-9][0-9][0-9]';
!     my $date_rx = "($days_rx)\\s+($months_rx)";
!     my $monthly_rx = "([1-6])\\s+($wdays_rx)";
!     my $full_date_rx = "$date_rx\\s+($years_rx)";
!     my $weekly_rx = "E\\s+($wdays_rx)";
!     my $periodic_rx = "E([0-9]+)\\s+$full_date_rx";
!     my $numdaymon_rx = "([0-9L])\\s+($wdays_rx)\\s+($months_rx)";
!     $text = getTopicText(\%options, $theTopic, $theWeb, $refText);
! 
  
      # recursively expand includes
***************
*** 520,527 ****
  }
  sub getTopicText {
!     my (%options, $theTopic, $theWeb, $refText) = @_;
!     my $topics = $options{topic};
! #   return "   * 1 Mar 2002 - foo ". $topics."\n";
  
  # I've disabled this functionality as I was not clear what I was supposed to 
  # do with it. Check the src code of the previous version if it does not work
--- 521,529 ----
  }
  sub getTopicText {
!     my ($options, $theTopic, $theWeb, $refText) = @_;
  
+     my $topics = $options->{topic};
+ 
+ #   return "   * 1 Mar 2002 - foo ". $topics."\n";
  # I've disabled this functionality as I was not clear what I was supposed to 
  # do with it. Check the src code of the previous version if it does not work