--- loncom/homework/lonhomework.pm	2004/12/22 22:05:40	1.190
+++ loncom/homework/lonhomework.pm	2005/03/01 03:24:05	1.197
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.190 2004/12/22 22:05:40 albertel Exp $
+# $Id: lonhomework.pm,v 1.197 2005/03/01 03:24:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,7 +116,7 @@ sub get_target {
 		    return ('web','answer');
 		}
 	    } elsif ( $ENV{'form.problemmode'} eq &mt('Edit') ||
-		      $ENV{'form.problemmode'} ee 'Edit') {
+		      $ENV{'form.problemmode'} eq 'Edit') {
 		if ( $ENV{'form.submitted'} eq 'edit' ) {
 		    if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) {
 			return ('modified','web','answer');
@@ -320,7 +320,7 @@ sub check_access {
 	    &Apache::lonxml::debug("looking for accesstime $first_access");
 	    if (!$first_access) {
 		$status='NOT_YET_VIEWED';
-		$datemsg=' '.$interval.' seconds';
+		$datemsg=&seconds_to_human_length($interval);
 	    } else {
 		my $newdate=localtime($first_access+$interval);
 		if (time > ($first_access+$interval)) {
@@ -348,6 +348,25 @@ sub check_access {
     return ($status,$datemsg);
 }
 
+sub seconds_to_human_length {
+    my ($length)=@_;
+
+    my $seconds=$length%60; $length=int($length/60);
+    my $minutes=$length%60; $length=int($length/60);
+    my $hours=$length%24;   $length=int($length/24);
+    my $days=$length;
+
+    my $timestr;
+    if ($days > 0) { $timestr.=&mt('[quant,_1,day]',$days); }
+    if ($hours > 0) { $timestr.=($timestr?", ":"").
+			  &mt('[quant,_1,hour]',$hours); }
+    if ($minutes > 0) { $timestr.=($timestr?", ":"").
+			    &mt('[quant,_1,minute]',$minutes); }
+    if ($seconds > 0) { $timestr.=($timestr?", ":"").
+			    &mt('[quant,_1,second]',$seconds); }
+    return $timestr;
+}
+
 sub showhash {
     my (%hash) = @_;
     &showhashsubset(\%hash,'.');
@@ -358,10 +377,11 @@ sub showarray {
     my ($array)=@_;
     my $string="(";
     foreach my $elm (@{ $array }) {
-	if (ref($elm)) {
-	    if ($elm =~ /ARRAY/ ) {
-		$string.=&showarray($elm);
-	    }
+	if (ref($elm) eq 'ARRAY') {
+	    $string.=&showarray($elm);
+	} elsif (ref($elm) eq 'HASH') {
+	    $string.= "HASH --- \n<br />";
+	    $string.= &showhashsubset($elm,'.');
 	} else {
 	    $string.="$elm,"
 	}
@@ -375,20 +395,15 @@ sub showhashsubset {
     my ($hash,$keyre) = @_;
     my $resultkey;
     foreach $resultkey (sort keys %$hash) {
-	if ($resultkey =~ /$keyre/) {
-	    if (ref($$hash{$resultkey})) {
-		if ($$hash{$resultkey} =~ /ARRAY/ ) {
-		    &Apache::lonxml::debug("$resultkey ---- ".
-					   &showarray($$hash{$resultkey}));
-		} elsif ($$hash{$resultkey} =~ /HASH/ ) {
-		    &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
-		    &showhashsubset($$hash{$resultkey},'.');
-		} else {
-		    &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
-		}
-	    } else {
-		&Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
-	    }
+	if ($resultkey !~ /$keyre/) { next; }
+	if (ref($$hash{$resultkey})  eq 'ARRAY' ) {
+	    &Apache::lonxml::debug("$resultkey ---- ".
+				   &showarray($$hash{$resultkey}));
+	} elsif (ref($$hash{$resultkey}) eq 'HASH' ) {
+	    &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
+	    &showhashsubset($$hash{$resultkey},'.');
+	} else {
+	    &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
 	}
     }
     &Apache::lonxml::debug("\n<br />restored values^</br>\n");
@@ -416,14 +431,12 @@ sub setuppermissions {
 
 sub setupheader {
     my $request=$_[0];
-    if ($ENV{'browser.mathml'}) {
-	&Apache::loncommon::content_type($request,'text/xml');
-    } else {
-	&Apache::loncommon::content_type($request,'text/html');
-    }
+    &Apache::loncommon::content_type($request,'text/html');
     if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
 	&Apache::loncommon::no_cache($request);
     }
+#    $request->set_last_modified(&Apache::lonnet::metadata($request->uri,
+#							  'lastrevisiondate'));
     $request->send_http_header;
     return OK if $request->header_only;
     return ''
@@ -479,7 +492,8 @@ sub analyze_header {
     if ($ENV{'environment.remote'} eq 'off') {
 	$bodytag=&Apache::loncommon::bodytag();
     }
-    my $result.='<html>
+    my $html=&Apache::lonxml::xmlbegin();
+    my $result.=$html.'
             <head><title>'.&mt("Analyzing a problem").'</title></head>
             '.$bodytag.&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
@@ -606,7 +620,8 @@ sub editxmlmode {
 	if ($ENV{'environment.remote'} eq 'off') {
 	    $bodytag=&Apache::loncommon::bodytag();
 	}
-	$result.='<html>'.$bodytag.&Apache::lonxml::message_location().'
+	my $html=&Apache::lonxml::xmlbegin();
+	$result.=$html.$bodytag.&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
 	    &HTML::Entities::encode($ENV{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
@@ -799,18 +814,14 @@ sub handler {
     $Apache::lonxml::debug=$ENV{'user.debug'};
     $ENV{'request.uri'}=$request->uri;
     &setuppermissions();
-    &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
     # some times multiple problemmodes are submitted, need to select
     # the last one
-    &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
-    if ( defined($ENV{'form.problemmode'}) &&
-	 ref($ENV{'form.problemmode'}) ) {
-	&Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'}));
+    if ( defined($ENV{'form.problemmode'}) && ref($ENV{'form.problemmode'}) ) {
 	my $mode=$ENV{'form.problemmode'}->[-1];
 	undef $ENV{'form.problemmode'};
 	$ENV{'form.problemmode'}=$mode;
     }
-    &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
+
     my $file=&Apache::lonnet::filelocation("",$request->uri);
 
     #check if we know where we are
@@ -827,7 +838,8 @@ sub handler {
 	}
     }
     if (&setupheader($request)) { return OK; }
-
+    &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
+    &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
     my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);
     if ($ENV{'request.state'} eq "construct" || $symb eq '') {
@@ -849,7 +861,7 @@ sub handler {
 		$ENV{'form.problemmode'}='View';
 		&renderpage($request,$file);
 	    } elsif ($ENV{'form.problemmode'} eq &mt('EditXML') ||
-		     $ENV{'form.problemmode'} eq 'EditXML' {
+		     $ENV{'form.problemmode'} eq 'EditXML') {
 		&editxmlmode($request,$file);
 	    } elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) {
 		&analyze($request,$file);