--- loncom/interface/lonnavmaps.pm	2003/10/09 21:02:11	1.239
+++ loncom/interface/lonnavmaps.pm	2004/01/30 23:38:19	1.244
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.239 2003/10/09 21:02:11 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.244 2004/01/30 23:38:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -371,7 +371,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 +393,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 +406,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 +895,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
@@ -2345,6 +2341,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 +2363,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:
@@ -3578,10 +3574,7 @@ sub extractParts {
 
     # Retrieve part count, if this is a problem
     if ($self->is_problem()) {
-	my $partorder;
-	# Hypothetically, replace previous line with:
-	# my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
-	# and it'll all work...
+	my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
         my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');
 
 	if ($partorder) {
@@ -3589,6 +3582,7 @@ sub extractParts {
 	    for my $part (split (/,/,$partorder)) {
 		if (!Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
 		    push @parts, $part;
+		    $parts{$part} = 1;
 		}
 	    }
 	    $self->{PARTS} = \@parts;
@@ -3604,8 +3598,8 @@ sub extractParts {
 		    my $part = $1;
 		    # This floods the logs if it blows up
 		    if (defined($parts{$part})) {
-			Apache::lonnet::logthis("$part multiply defined in metadata for " . $self->symb());
-		      }
+			&Apache::lonnet::logthis("$part multiply defined in metadata for " . $self->symb());
+		    }
 		    
 		    # check to see if part is turned off.
 		    
@@ -3641,7 +3635,6 @@ sub extractParts {
                 my $partIdSoFar = '';
                 my @partChunks = split /_/, $partStuff;
                 my $i = 0;
-
                 for ($i = 0; $i < scalar(@partChunks); $i++) {
                     if ($partIdSoFar) { $partIdSoFar .= '_'; }
                     $partIdSoFar .= $partChunks[$i];
@@ -3654,7 +3647,6 @@ sub extractParts {
                 }
             }
         }
-
         $self->{RESPONSE_IDS} = \%responseIdHash;
         $self->{RESPONSE_TYPES} = \%responseTypeHash;
     }