--- loncom/interface/lonnavmaps.pm	2003/11/06 15:24:13	1.241
+++ loncom/interface/lonnavmaps.pm	2004/03/08 17:31:37	1.251
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.241 2003/11/06 15:24:13 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.251 2004/03/08 17:31:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,20 +25,7 @@
 #
 # http://www.lon-capa.org/
 #
-# (Page Handler
-#
-# (TeX Content Handler
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
-# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)
-#
-# 3/1/1,6/1,17/1,29/1,30/1,2/8,9/21,9/24,9/25 Gerd Kortemeyer
-# YEAR=2002
-# 1/1 Gerd Kortemeyer
-# Oct-Nov Jeremy Bowers
-# YEAR=2003
-# Jeremy Bowers ... lots of days
+###
 
 package Apache::lonnavmaps;
 
@@ -303,8 +290,16 @@ sub getLinkForResource {
 
     # Check to see if there are any pages in the stack
     foreach $res (@$stack) {
-        if (defined($res) && $res->is_page()) {
-            return $res->src();
+        if (defined($res)) {
+	    if ($res->is_page()) {
+		return $res->src();
+	    }
+            # in case folder was skipped over as "only sequence"
+	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
+	    if ($map=~/\.page$/) {
+		return &Apache::lonnet::clutter($map).'#'.
+		    &Apache::lonnet::escape(&Apache::lonnet::declutter($src));
+	    }
         }
     }
 
@@ -319,9 +314,9 @@ sub getLinkForResource {
     return $res->src();
 }
 
-# Convenience function: This seperates the logic of how to create
+# Convenience function: This separates the logic of how to create
 # the problem text strings ("Due: DATE", "Open: DATE", "Not yet assigned",
-# etc.) into a seperate function. It takes a resource object as the
+# etc.) into a separate function. It takes a resource object as the
 # first parameter, and the part number of the resource as the second.
 # It's basically a big switch statement on the status of the resource.
 
@@ -371,7 +366,7 @@ sub getDescription {
                 $triesString = "<b>$triesString</b>";
             }
         }
-        if ($res->duedate()) {
+        if ($res->duedate($part)) {
             return &mt("Due")." " . timeToHumanString($res->duedate($part)) .
                 " $triesString";
         } else {
@@ -393,8 +388,8 @@ sub dueInLessThen24Hours {
 
     return ($status == $res->OPEN() ||
             $status == $res->TRIES_LEFT()) &&
-           $res->duedate() && $res->duedate() < time()+(24*60*60) &&
-           $res->duedate() > time();
+	    $res->duedate($part) && $res->duedate($part) < time()+(24*60*60) &&
+	    $res->duedate($part) > time();
 }
 
 # Convenience function, so others can use it: Is there only one try remaining for the
@@ -406,8 +401,8 @@ sub lastTry {
     my $tries = $res->tries($part);
     my $maxtries = $res->maxtries($part);
     return $tries && $maxtries && $maxtries > 1 &&
-        $maxtries - $tries == 1 && $res->duedate() &&
-        $res->duedate() > time();
+        $maxtries - $tries == 1 && $res->duedate($part) &&
+        $res->duedate($part) > time();
 }
 
 # This puts a human-readable name on the ENV variable.
@@ -895,12 +890,8 @@ sub render_resource {
             $icon = $params->{'indentString'};
         }
     } else {
-	my $curfext= (split (/\./,$resource->src))[-1];
-	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
-	# The unless conditional that follows is a bit of overkill
-	if (!(!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn')) {
-	    $icon = "<img src='/adm/lonIcons/$curfext.gif' alt='' border='0' />";
-	}
+	$icon = "<img src='".&Apache::loncommon::icon($resource->src).
+	    "' alt='' border='0' />";
     }
 
     # Display the correct map icon to open or shut map
@@ -970,7 +961,11 @@ sub render_resource {
 
     if ($resource->is_problem() && $part ne '0' && 
         !$params->{'condensed'}) {
-        $partLabel = " (Part $part)";
+	my $displaypart=&Apache::lonnet::EXT('resource.'.$part.'.display',
+					     $resource->symb());
+	unless ($displaypart) { $displaypart=$part; }
+        $partLabel = " (Part: $displaypart)";
+	$link.='#'.&Apache::lonnet::escape($part);
         $title = "";
     }
 
@@ -1545,11 +1540,15 @@ sub render {
             my $filter = $it->{FILTER};
             my $stack = $it->getStack();
             my $src = getLinkForResource($stack);
-            
+            my $anchor='';
+            if ($src=~s/(\#.*$)//) {
+		$anchor=$1;
+	    }
             my $srcHasQuestion = $src =~ /\?/;
             $args->{"resourceLink"} = $src.
                 ($srcHasQuestion?'&':'?') .
-                'symb=' . &Apache::lonnet::escape($curRes->symb());
+                'symb=' . &Apache::lonnet::escape($curRes->symb()).
+		$anchor;
             
             # Now, display each column.
             foreach my $col (@$cols) {
@@ -1600,7 +1599,12 @@ sub render {
     # it's quite likely this might fix other browsers, too, and 
     # certainly won't hurt anything.
     if ($displayedJumpMarker) {
-        $result .= "<script>setTimeout(\"location += '#curloc';\", 0)</script>\n";
+        $result .= "
+<script>
+if (location.href.indexOf('#curloc')==-1) {
+    setTimeout(\"location += '#curloc';\", 0)
+}
+</script>";
     }
 
     $result .= "</table>";
@@ -2102,7 +2106,11 @@ sub parmval_real {
 
 # ----------------------------------------------------- fourth , check default
 
-    my $default=&Apache::lonnet::metadata($fn,$rwhat.'.default');
+    my $meta_rwhat=$rwhat;
+    $meta_rwhat=~s/\./_/g;
+    my $default=&Apache::lonnet::metadata($fn,$meta_rwhat);
+    if (defined($default)) { return $default}
+    $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);
     if (defined($default)) { return $default}
 
 # --------------------------------------------------- fifth , cascade up parts
@@ -2345,6 +2353,8 @@ consisting entirely of empty resources e
 ending resource, will cause a lot of BRANCH_STARTs and BRANCH_ENDs,
 but only one resource will be returned.
 
+=back
+
 =head2 Normal Usage
 
 Normal usage of the iterator object is to do the following:
@@ -2365,8 +2375,6 @@ the depth of the iterator to see when it
 code. It is difficult to get right and harder to understand then
 this. They should be migrated to this new style.
 
-=back
-
 =cut
 
 # Here are the tokens for the iterator:
@@ -2734,7 +2742,7 @@ package Apache::lonnavmaps::DFSiterator;
 #  useful for pre-processing of some kind, and is in fact used by the main
 #  iterator that way, but that's about it.
 # One could imagine merging this into the init routine of the main iterator,
-#  but this might as well be left seperate, since it is possible some other
+#  but this might as well be left separate, since it is possible some other
 #  use might be found for it. - Jeremy
 
 # Unlike the main iterator, this DOES return all resources, even blank ones.
@@ -3167,7 +3175,7 @@ sub is_page {
 sub is_problem {
     my $self=shift;
     my $src = $self->src();
-    return ($src =~ /problem$/);
+    return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library)$/);
 }
 sub is_sequence {
     my $self=shift;
@@ -3842,7 +3850,7 @@ sub getCompletionStatus {
 
     my $status = $self->queryRestoreHash('solved', shift);
 
-    # Left as seperate if statements in case we ever do more with this
+    # Left as separate if statements in case we ever do more with this
     if ($status eq 'correct_by_student') {return $self->CORRECT;}
     if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; }
     if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }