--- loncom/interface/lonnavmaps.pm	2005/11/22 02:24:50	1.350
+++ loncom/interface/lonnavmaps.pm	2005/12/05 19:30:22	1.353
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.350 2005/11/22 02:24:50 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.353 2005/12/05 19:30:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2230,9 +2230,9 @@ sub generate_email_discuss_status {
 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
 	    my $plain=
 		&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
-	    if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
-		my ($what,$url)=($1,$2);
-		if ($what eq 'Error') {
+	    if ($plain=~/ \[([^\]]+)\]\:/) {
+		my $url=$1;
+		if ($plain=~/\:Error \[/) {
 		    $error{$url}.=','.$msgid; 
 		} else {
 		    $feedback{$url}.=','.$msgid;
@@ -2578,14 +2578,17 @@ sub parmval_real {
 
 =pod
 
-=item * B<getResourceByUrl>(url):
+=item * B<getResourceByUrl>(url,multiple):
 
-Retrieves a resource object by URL of the resource. If passed a
-resource object, it will simply return it, so it is safe to use this
-method in code like "$res = $navmap->getResourceByUrl($res)", if
-you're not sure if $res is already an object, or just a URL. If the
-resource appears multiple times in the course, only the first instance
-will be returned. As a result, this is probably useful only for maps.
+Retrieves a resource object by URL of the resource, unless the optional
+multiple parameter is included in wahich caes an array of resource 
+objects is returned. If passed a resource object, it will simply return  
+it, so it is safe to use this method in code like
+"$res = $navmap->getResourceByUrl($res)"
+if you're not sure if $res is already an object, or just a URL. If the
+resource appears multiple times in the course, only the first instance 
+will be returned (useful for maps), unless the multiple parameter has
+been included, in which case all instances are returned in an array.
 
 =item * B<retrieveResources>(map, filterFunc, recursive, bailout, showall):
 
@@ -2620,22 +2623,41 @@ Convience method for
 which will tell whether the map has resources matching the description
 in the filter function.
 
+=item * B<usedVersion>(url):
+
+Retrieves version infomation for a url. Returns the version (a number, or 
+the string "mostrecent") for resources which have version information in  
+the big hash.
+    
 =cut
 
 
 sub getResourceByUrl {
     my $self = shift;
     my $resUrl = shift;
+    my $multiple = shift;
 
     if (ref($resUrl)) { return $resUrl; }
 
     $resUrl = &Apache::lonnet::clutter($resUrl);
     my $resId = $self->{NAV_HASH}->{'ids_' . $resUrl};
-    if ($resId =~ /,/) {
-        $resId = (split (/,/, $resId))[0];
-    }
     if (!$resId) { return ''; }
-    return $self->getById($resId);
+    if ($multiple) {
+        my @resources = ();
+        my @resIds = split (/,/, $resId);
+        foreach my $id (@resIds) {
+            my $resourceId = $self->getById($id);
+            if ($resourceId) { 
+                push(@resources,$resourceId);
+            }
+        }
+        return @resources;
+    } else {
+        if ($resId =~ /,/) {
+            $resId = (split (/,/, $resId))[0];
+        }
+        return $self->getById($resId);
+    }
 }
 
 sub retrieveResources {
@@ -2703,6 +2725,12 @@ sub hasResource {
     return scalar($self->retrieveResources($map, $filterFunc, $recursive, 1, $showall)) > 0;
 }
 
+sub usedVersion {
+    my $self = shift;
+    my $linkurl = shift;
+    return $self->navhash("version_$linkurl");
+}
+
 1;
 
 package Apache::lonnavmaps::iterator;