--- loncom/interface/lonannounce.pm	2006/11/29 07:46:39	1.62
+++ loncom/interface/lonannounce.pm	2006/12/05 02:55:51	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.62 2006/11/29 07:46:39 raeburn Exp $
+# $Id: lonannounce.pm,v 1.63 2006/12/05 02:55:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::lonnavmaps();
 use Apache::lonrss();
 use Apache::lonnet;
 use HTML::Entities();
+use LONCAPA qw(:match);
 
 my %todayhash;
 my %showedcheck;
@@ -92,7 +93,7 @@ sub readcalendar {
     foreach my $thiskey (sort keys %resourcedata) {
 	if ($resourcedata{$thiskey.'.type'}=~/^date/) {
 	    my ($course,$middle,$part,$name)=
-		($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+		($thiskey=~/^($match_courseid)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
 	    my %data = ( 'section' => &mt('All Students'));
 	    if ($middle=~/^\[(.*)\]\./) {
 		my $sec=$1;
@@ -309,7 +310,7 @@ sub showday {
 	$nextday+=$oneday;
     }
     foreach my $item (keys(%allcal)) {
-	my ($course,$startdate,$enddate)=($item=~/^(\w+)\@(\d+)\_(\d+)$/);
+	my ($course,$startdate,$enddate)=($item=~/^($match_courseid)\@(\d+)\_(\d+)$/);
         if (($startdate<$nextday) && ($enddate>=$tk))  {
 	    push(@outp,[$course,$startdate,$enddate,$allcal{$item}]);
         }
@@ -375,7 +376,7 @@ sub output_ics_file {
     $r->print("PRODID:-//LONCAPA//LONCAPA Calendar Output//EN$crlf");
     my %allcal=&get_all_calendars();
     foreach my $event (keys(%allcal)) {
-	my ($courseid,$startdate,$enddate)=($event=~/^(\w+)\@(\d+)\_(\d+)$/);
+	my ($courseid,$startdate,$enddate)=($event=~/^($match_courseid)\@(\d+)\_(\d+)$/);
 	my $uid=$event;
 	$uid=~s/[\W\_]/-/gs;
 	$uid.='@loncapa';