--- loncom/interface/lonnavmaps.pm	2006/05/15 23:51:34	1.349.2.9
+++ loncom/interface/lonnavmaps.pm	2006/01/12 23:35:55	1.358
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.349.2.9 2006/05/15 23:51:34 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.358 2006/01/12 23:35:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2066,15 +2066,16 @@ In order of increasing complexity and po
 
 =over 4
 
-=item * C<$navmap-E<gt>getByX>, where X is B<Id>, B<Symb>, B<Url> or B<MapPc>. This provides
+=item * C<$navmap-E<gt>getByX>, where X is B<Id>, B<Symb> or B<MapPc> and getResourceByUrl. This provides
     various ways to obtain resource objects, based on various identifiers.
     Use this when you want to request information about one object or 
     a handful of resources you already know the identities of, from some
     other source. For more about Ids, Symbs, and MapPcs, see the
     Resource documentation. Note that Url should be a B<last resort>,
-    not your first choice; it only works when there is only one
+    not your first choice; it only really works when there is only one
     instance of the resource in the course, which only applies to
-    maps, and even that may change in the future.
+    maps, and even that may change in the future (see the B<getResourceByUrl>
+    documentation for more details.)
 
 =item * C<my @resources = $navmap-E<gt>retrieveResources(args)>. This
     retrieves resources matching some criterion and returns them
@@ -2495,6 +2496,12 @@ sub parmval_real {
 
     my $cid=$env{'request.course.id'};
     my $csec=$env{'request.course.sec'};
+    my $cgroup='';
+    my @cgrps=split(/:/,$env{'request.course.groups'});
+    if (@cgrps > 0) {
+        @cgrps = sort(@cgrps);
+        $cgroup = $cgrps[0];
+    } 
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
 
@@ -2502,7 +2509,7 @@ sub parmval_real {
     my $result='';
 
     my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
-    $mapname = &Apache::lonnet::deversion($mapname);
+
 # ----------------------------------------------------- Cascading lookup scheme
     my $rwhat=$what;
     $what=~s/^parameter\_//;
@@ -2512,6 +2519,10 @@ sub parmval_real {
     my $mapparm=$mapname.'___(all).'.$what;
     my $usercourseprefix=$cid;
 
+    my $grplevel=$usercourseprefix.'.['.$cgroup.'].'.$what;
+    my $grplevelr=$usercourseprefix.'.['.$cgroup.'].'.$symbparm;
+    my $grplevelm=$usercourseprefix.'.['.$cgroup.'].'.$mapparm;
+
     my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;
     my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;
     my $seclevelm=$usercourseprefix.'.['.$csec.'].'.$mapparm;
@@ -2532,6 +2543,12 @@ sub parmval_real {
     }
 
 # ------------------------------------------------------- second, check course
+    if ($cgroup ne '' and defined($courseopt)) {
+        if (defined($$courseopt{$grplevelr})) { return $$courseopt{$grplevelr}; }
+        if (defined($$courseopt{$grplevelm})) { return $$courseopt{$grplevelm}; }
+        if (defined($$courseopt{$grplevel})) { return $$courseopt{$grplevel}; }
+    }
+
     if ($csec and defined($courseopt)) {
         if (defined($$courseopt{$seclevelr})) { return $$courseopt{$seclevelr}; }
         if (defined($$courseopt{$seclevelm})) { return $$courseopt{$seclevelm}; }
@@ -3641,8 +3658,9 @@ sub condition {
 }
 sub condval {
     my $self=shift;
-    my ($pathname,$filename) = 
-	&Apache::lonnet::split_uri_for_cond($self->src());
+    my $uri=&Apache::lonnet::deversion(&Apache::lonnet::declutter($self->src()));
+    my ($pathname,$filename)=($uri=~m|(.*)/([^/]*)|);
+    $pathname=~s/^adm\/wrapper\///;    
 
     my $match=($env{'acc.res.'.$env{'request.course.id'}.'.'.$pathname}=~
 	       /\&\Q$filename\E\:([\d\|]+)\&/);
@@ -3728,6 +3746,7 @@ sub contains_problem {
 }
 sub is_sequence {
     my $self=shift;
+    my $src = $self->src();
     return $self->navHash("is_map_", 1) && 
 	$self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
 }
@@ -3797,7 +3816,7 @@ Returns a string with the type of the ma
 sub map_finish {
     my $self = shift;
     my $src = $self->src();
-    $src = &Apache::lonnet::clutter($src);
+    $src = Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_finish_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;
@@ -3810,7 +3829,7 @@ sub map_pc {
 sub map_start {
     my $self = shift;
     my $src = $self->src();
-    $src = &Apache::lonnet::clutter($src);
+    $src = Apache::lonnet::clutter($src);
     my $res = $self->navHash("map_start_$src", 0);
     $res = $self->{NAV_MAP}->getById($res);
     return $res;