--- loncom/interface/lonnavmaps.pm	2001/09/21 19:56:45	1.15
+++ loncom/interface/lonnavmaps.pm	2001/12/19 17:17:46	1.20
@@ -1,6 +1,30 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
+# $Id: lonnavmaps.pm,v 1.20 2001/12/19 17:17:46 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Page Handler
 #
 # (TeX Content Handler
@@ -9,13 +33,14 @@
 # 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 Gerd Kortemeyer
+# 3/1/1,6/1,17/1,29/1,30/1,2/8,9/21,9/24,9/25 Gerd Kortemeyer
 
 package Apache::lonnavmaps;
 
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet();
+use Apache::loncommon();
 use HTML::TokeParser;
 use GDBM_File;
 
@@ -166,78 +191,64 @@ sub astatus {
         }
     } sort split(/\,/,&Apache::lonnet::metadata($hash{'src_'.$rid},'keys'));
 
-    my $duedate=&parmval('0.duedate',$symb);
-    my $opendate=&parmval('0.opendate',$symb);
-    my $answerdate=&parmval('0.answerdate',$symb);
     my $now=time;
     my $tcode=0;
+
+    my %returnhash=&Apache::lonnet::restore($symb);
+
+  map {
+
+   my $duedate=$duedate{$_};
+   my $opendate=$opendate{$_};
+   my $answerdate=$answerdate{$_};
+   my $preface='';
+   unless ($_ eq '0') { $preface=' Part: '.$_.' '; }
    if ($opendate) {
     if ($now<$duedate) {
-        $tcode=2; 
-        $ctext='Due: '.localtime($duedate);
+        unless ($tcode==4) { $tcode=2; } 
+        $ctext.=$preface.'Due: '.localtime($duedate);
         if ($now<$opendate) { 
-          $tcode=1; 
-          $ctext='Open: '.localtime($opendate);
+          unless ($tcode) { $tcode=1; } 
+          $ctext.=$preface.'Open: '.localtime($opendate);
         }
         if ($duedate-$now<86400) {
 	   $tcode=4;
-           $ctext='Due: '.localtime($duedate);
+           $ctext.=$preface.'Due: '.localtime($duedate);
         }
      } else {
-       $tcode=3;
+	 unless (($tcode==4) || ($tcode eq 2)) { $tcode=3; }
        if ($now<$answerdate) {  
-          $ctext='Answer: '.localtime($duedate);
+          $ctext.='Answer: '.localtime($duedate);
        }
     }
    } else {
-    $tcode=1;
+       unless (($tcode==2) || ($tcode==4)) { $tcode=1; }
    }
-    my $answer=&Apache::lonnet::reply(
-              "restore:$ENV{'user.domain'}:$ENV{'user.name'}:".
-              $ENV{'request.course.id'}.':'.
-              &Apache::lonnet::escape($symb),
-              "$ENV{'user.home'}");
-    my %returnhash=();
-    map {
-	my ($name,$value)=split(/\=/,$_);
-        $returnhash{&Apache::lonnet::unescape($name)}=
-                    &Apache::lonnet::unescape($value);
-    } split(/\&/,$answer);
-    if ($returnhash{'version'}) {
-       my $version;
-       for ($version=1;$version<=$returnhash{'version'};$version++) {
-          map {
-             $returnhash{$_}=$returnhash{$version.':'.$_};
-          } split(/\:/,$returnhash{$version.':keys'});
-       }
-       map {
-           if (($_=~/\.(\w+)\.solved$/) && ($_!~/^\d+\:/)) {
-               my $part=$1;
-               if ($ctext) { $ctext.=', '; }
-               if ($part) {
-		   $ctext.='Part '.$part.': ';
-               }
-	       if ($returnhash{$_} eq 'correct_by_student') {
+
+    my $status=$returnhash{'resource.'.$_.'.solved'};
+
+	       if ($status eq 'correct_by_student') {
                    unless ($code==2) { $code=3; }
-                   $ctext.='solved';
-               } elsif ($returnhash{$_} eq 'correct_by_override') {
+                   $ctext.=' solved';
+               } elsif ($status eq 'correct_by_override') {
                    unless ($code==2) { $code=3; }
-                   $ctext.='override';
-               } elsif ($returnhash{$_} eq 'incorrect_attempted') {
+                   $ctext.=' override';
+               } elsif ($status eq 'incorrect_attempted') {
                    $code=2;
-                   $ctext.=
-                     $returnhash{'resource.'.$part.'.tries'}.'/'.
-                     &parmval($part.'.maxtries',$symb).' tries';
-               } elsif ($returnhash{$_} eq 'incorrect_by_override') {
+                   $ctext.=' ('.
+                     ($returnhash{'resource.'.$_.'.tries'}?
+                      $returnhash{'resource.'.$_.'.tries'}:'0').'/'.
+                     &parmval($_.'.maxtries',$symb).' tries)';
+               } elsif ($status eq 'incorrect_by_override') {
                    $code=2;
-                   $ctext.='override';
-               } elsif ($returnhash{$_} eq 'excused') {
+                   $ctext.=' override';
+               } elsif ($status eq 'excused') {
                    unless ($code==2) { $code=3; }
-                   $ctext.='excused';
+                   $ctext.=' excused';
                }
-           }
-       } keys %returnhash;
-    }
+
+   } sort keys %opendate;
+
     return 'p'.$code.$tcode.'"'.$ctext.'"';
 }
 
@@ -457,10 +468,11 @@ sub handler {
 # ---------------------------------------------------------------- Send headers
 
                           $r->content_type('text/html');
+                          &Apache::loncommon::no_cache($r);
                           $r->send_http_header;
+		          my $date=localtime;
                           $r->print(
-                   '<html><head><title>Navigate LON-CAPA Maps</title></head>');
-
+		   '<html><head><title>Navigate LON-CAPA Maps</title></head>');
 			  $r->print('<body bgcolor="#FFFFFF"');
                           if (($currenturl=~/^\/res/) &&
                               ($currenturl!~/^\/res\/adm/)) {