--- loncom/interface/lonannounce.pm	2006/11/29 07:46:39	1.62
+++ loncom/interface/lonannounce.pm	2007/05/10 18:49:39	1.68
@@ -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.68 2007/05/10 18:49:39 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;
@@ -77,7 +78,8 @@ sub readcalendar {
     my %returnhash=();
     foreach my $item (keys(%thiscal)) {
         unless (($item=~/^error\:/) || ($thiscal{$item}=~/^error\:/)) {
-	   $returnhash{$courseid.'@'.$item}=$thiscal{$item};
+	    my ($start,$end)=split('_',$item);
+	    $returnhash{join("\0",$courseid,$start,$end)}=$thiscal{$item};
         }
     }
     my $can_see_hidden = ($env{'request.role.adv'} &&
@@ -87,12 +89,14 @@ sub readcalendar {
     if ($courseid eq $env{'request.course.id'}) {
 	$navmap = Apache::lonnavmaps::navmap->new();
     }
-    my %resourcedata=
-	&Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);
-    foreach my $thiskey (sort keys %resourcedata) {
-	if ($resourcedata{$thiskey.'.type'}=~/^date/) {
+
+    my $resourcedata=
+	&Apache::lonnet::get_courseresdata($coursenum,$coursedom);
+    foreach my $thiskey (keys(%$resourcedata)) {
+	if ($resourcedata->{$thiskey.'.type'}=~/^date/) {
 	    my ($course,$middle,$part,$name)=
-		($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+		($thiskey=~/^(\Q$courseid\E)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+
 	    my %data = ( 'section' => &mt('All Students'));
 	    if ($middle=~/^\[(.*)\]\./) {
 		my $sec=$1;
@@ -118,7 +122,9 @@ sub readcalendar {
 		}
 		if (!$can_see_hidden) {
 		    my $res = $navmap->getResourceByUrl($map_url);
-		    if ($res && $res->randomout()) { next; }
+		    if ($res && $res->randomout()) {
+			next;
+		    }
 		}
 		$data{'realm'}=&mt('Folder/Map');
 		$data{'url'} = $map_url;
@@ -128,7 +134,9 @@ sub readcalendar {
 		}
 		if (!$can_see_hidden) {
 		    my $res = $navmap->getBySymb($middle);
-		    if ($res && $res->randomout()) { next; }
+		    if ($res && $res->randomout()) {
+			next;
+		    }
 		}
 		$data{'realm'} = &mt('Resource');
 		$data{'symb'} = $middle;
@@ -139,7 +147,7 @@ sub readcalendar {
 # see if accidentally answerdate is before duedate
 		my $answerkey=$thiskey;
 		$answerkey=~s/duedate$/answerdate/;
-		if ($resourcedata{$thiskey}>$resourcedata{$answerkey}) {
+		if ($resourcedata->{$thiskey}>$resourcedata->{$answerkey}) {
 		    $data{'datetype'} = &mt('Due and Answer Available');
 		}
 	    }
@@ -154,14 +162,15 @@ sub readcalendar {
 # see if accidentally answerdate is before duedate
 		my $duekey=$thiskey;
 		$duekey=~s/answerdate$/duedate/;
-		if ($resourcedata{$duekey}>$resourcedata{$thiskey}) {
+		if ($resourcedata->{$duekey}>$resourcedata->{$thiskey}) {
 # forget it
 		    next;
 		} 
 		$data{'datetype'}=&mt('Answer Available'); 
 	    }
-	    $returnhash{$courseid.'@'.$resourcedata{$thiskey}.'_'.
-			    $resourcedata{$thiskey}}=\%data;
+	    $returnhash{join("\0",$courseid,
+			     $resourcedata->{$thiskey},
+			     $resourcedata->{$thiskey})}=\%data;
 	}
     }
     return %returnhash;
@@ -309,9 +318,9 @@ sub showday {
 	$nextday+=$oneday;
     }
     foreach my $item (keys(%allcal)) {
-	my ($course,$startdate,$enddate)=($item=~/^(\w+)\@(\d+)\_(\d+)$/);
-        if (($startdate<$nextday) && ($enddate>=$tk))  {
-	    push(@outp,[$course,$startdate,$enddate,$allcal{$item}]);
+	my ($courseid,$startdate,$enddate)= split("\0",$item);
+	if (($startdate<$nextday) && ($enddate>=$tk))  {
+	    push(@outp,[$courseid,$startdate,$enddate,$allcal{$item}]);
         }
     }
     unless ($mode) {
@@ -375,7 +384,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)= split('\0',$event);
 	my $uid=$event;
 	$uid=~s/[\W\_]/-/gs;
 	$uid.='@loncapa';
@@ -494,11 +503,13 @@ Post announcements to the system login a
 Check machines:<br />
 SERVERANNOUNCE
 # list servers
-    foreach my $host (sort(keys(%Apache::lonnet::hostname))) {
-	if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$host})) {
+    my %hostname = &Apache::lonnet::all_hostnames();
+    foreach my $host (sort(keys(%hostname))) {
+	if (&Apache::lonnet::allowed('psa',
+				     &Apache::lonnet::host_domain($host))) {
 	    $r->print ('<br /><label><input type="checkbox" name="postto_'.$host.'" /> '.
-		       $host.' <tt>'.$Apache::lonnet::hostname{$host}.'</tt> '.
-		       '</label><a href="http://'.$Apache::lonnet::hostname{$host}.
+		       $host.' <tt>'.$hostname{$host}.'</tt> '.
+		       '</label><a href="http://'.$hostname{$host}.
 		       '/announcement.txt" target="annowin">current</a>');
 	}
     }