--- loncom/interface/lonnavmaps.pm	2003/09/30 15:37:18	1.236
+++ loncom/interface/lonnavmaps.pm	2003/12/30 20:47:23	1.243
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.236 2003/09/30 15:37:18 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.243 2003/12/30 20:47:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -432,7 +432,7 @@ sub timeToHumanString {
         return &mt('never');
     }
     unless (&Apache::lonlocal::current_language()=~/^en/) {
-	return localtime($time);
+	return &Apache::lonlocal::locallocaltime($time);
     } 
     my $now = time();
 
@@ -501,7 +501,7 @@ sub timeToHumanString {
         # HH:MM
         if ( $delta < $day * 5 ) {
             my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time));
-            $timeStr =~ s/12:00 am/midnight/;
+            $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
             return ($inPast ? "last " : "next ") .
                 $timeStr;
@@ -511,14 +511,14 @@ sub timeToHumanString {
         if ( $time[5] == $now[5]) {
             # Return on Month Day, HH:MM meridian
             my $timeStr = strftime("on %A, %b %e at %I:%M %P", localtime($time));
-            $timeStr =~ s/12:00 am/midnight/;
+            $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
             return $timeStr;
         }
 
         # Not this year, so show the year
         my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time));
-        $timeStr =~ s/12:00 am/midnight/;
+        $timeStr =~ s/12:00 am/00:00/;
         $timeStr =~ s/12:00 pm/noon/;
         return $timeStr;
     }
@@ -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
@@ -1586,7 +1582,6 @@ sub render {
 	    # If we have the connection, make sure the user is still connected
 	    my $c = $r->connection;
 	    if ($c->aborted()) {
-		Apache::lonnet::logthis("navmaps aborted");
 		# Who cares what we do, nobody will see it anyhow.
 		return '';
 	    }
@@ -2346,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:
@@ -2366,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:
@@ -3579,32 +3574,44 @@ sub extractParts {
 
     # Retrieve part count, if this is a problem
     if ($self->is_problem()) {
+	my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
         my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');
-        if (!$metadata) {
-            $self->{RESOURCE_ERROR} = 1;
-            $self->{PARTS} = [];
-            $self->{PART_TYPE} = {};
-            return;
-        }
-        foreach (split(/\,/,$metadata)) {
-            if ($_ =~ /^part_(.*)$/) {
-                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());
-                  }
-
-                # check to see if part is turned off.
 
-                if (!Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
-                    $parts{$part} = 1;
-                }
-            }
+	if ($partorder) {
+	    my @parts;
+	    for my $part (split (/,/,$partorder)) {
+		if (!Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
+		    push @parts, $part;
+		    $parts{$part} = 1;
+		}
+	    }
+	    $self->{PARTS} = \@parts;
+	} else {
+	    if (!$metadata) {
+		$self->{RESOURCE_ERROR} = 1;
+		$self->{PARTS} = [];
+		$self->{PART_TYPE} = {};
+		return;
+	    }
+	    foreach (split(/\,/,$metadata)) {
+		if ($_ =~ /^part_(.*)$/) {
+		    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());
+		    }
+		    
+		    # check to see if part is turned off.
+		    
+		    if (!Apache::loncommon::check_if_partid_hidden($part, $self->symb())) {
+			$parts{$part} = 1;
+		    }
+		}
+	    }
+	    my @sortedParts = sort keys %parts;
+	    $self->{PARTS} = \@sortedParts;
         }
         
-        
-        my @sortedParts = sort keys %parts;
-        $self->{PARTS} = \@sortedParts;
 
         my %responseIdHash;
         my %responseTypeHash;
@@ -3616,7 +3623,7 @@ sub extractParts {
         }
 
         # Now, the unfortunate thing about this is that parts, part name, and
-        # response if are delimited by underscores, but both the part
+        # response id are delimited by underscores, but both the part
         # name and response id can themselves have underscores in them.
         # So we have to use our knowlege of part names to figure out 
         # where the part names begin and end, and even then, it is possible
@@ -3628,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];
@@ -3641,7 +3647,6 @@ sub extractParts {
                 }
             }
         }
-
         $self->{RESPONSE_IDS} = \%responseIdHash;
         $self->{RESPONSE_TYPES} = \%responseTypeHash;
     }