--- loncom/homework/lonhomework.pm	2001/06/26 21:39:15	1.47
+++ loncom/homework/lonhomework.pm	2001/11/05 22:49:14	1.62
@@ -1,7 +1,7 @@
 # The LON-CAPA Homework handler
 # Guy Albertelli
 # 11/30 Gerd Kortemeyer
-# 6/1 Gerd Kortemeyer
+# 6/1,8/17,8/18 Gerd Kortemeyer
 
 package Apache::lonhomework;
 use strict;
@@ -10,6 +10,7 @@ use Apache::lonxml;
 use Apache::lonnet;
 use Apache::inputtags;
 use Apache::structuretags;
+use Apache::randomlabel;
 use Apache::response;
 use Apache::hint;
 use Apache::outputtags;
@@ -22,24 +23,25 @@ sub BEGIN {
 
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
-    if ( defined $ENV{'form.submitted'}) {
+    if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');
     } else {
       return ('web');
     }
   } elsif ($ENV{'request.state'} eq "construct") {
-    if ( defined $ENV{'form.preview'}) {
-      if ( defined $ENV{'form.submitted'}) {
+    if ( defined($ENV{'form.preview'})) {
+      if ( defined($ENV{'form.submitted'})) {
 	return ('grade', 'web');
       } else {
 	return ('web');
       }
     } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {
-	if ( defined $ENV{'form.submitted'}) {
-	  return ('grade', 'web');
+	if ( defined($ENV{'form.submitted'}) &&
+	     (!defined($ENV{'form.resetdata'})) ) {
+	  return ('grade', 'web','answer');
 	} else {
-	  return ('web');
+	  return ('web','answer');
 	}
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
 	if ( $ENV{'form.submitted'} eq 'edit' ) {
@@ -84,7 +86,8 @@ sub send_footer {
 }
 
 $Apache::lonxml::browse='';
-sub check_date {
+
+sub check_access {
   my ($id) = @_;
   my $date ='';
   my $status = '';
@@ -130,6 +133,13 @@ sub check_date {
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
   }
+
+  if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
+      (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
+      return ('UNCHECKEDOUT','needs to be checked out');
+  }
+
+
   &Apache::lonxml::debug("sending back :$status:$datemsg:");
   if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) {
     &Apache::lonxml::debug("should be allowed to browse a resource when closed");
@@ -167,6 +177,7 @@ sub setupheader {
   } else {
     $request->content_type('text/html');
   }
+  &Apache::loncommon::no_cache($request);
   $request->send_http_header;
   return OK if $request->header_only;
   return ''
@@ -217,15 +228,9 @@ sub renderpage {
     my $result = '';
     &Apache::inputtags::initialize_inputtags;
     &Apache::edit::initialize_edit;
-    %Apache::lonhomework::results=();
-    %Apache::lonhomework::history=&Apache::lonnet::restore();
-    #ignore error conditions
-    my ($temp)=keys %Apache::lonhomework::history ;
-    if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } 
     if ($target eq 'web') {
       if (&Apache::lonnet::symbread() eq '') {
 	if ($ENV{'request.state'} eq "construct") {
-	  $request->print("In construction space, submissions ignored<br />");
 	} else {
 	  $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
 	}
@@ -254,14 +259,6 @@ sub renderpage {
       $request->print($result);
     }
     #$request->print(":Result ends");
-    if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); }
-
-    #store new values
-    my ($temp) = keys %Apache::lonhomework::results;
-    if ( $temp ne '' ) {
-      &Apache::lonxml::debug("Store return message:".
-			     &Apache::lonnet::cstore(\%Apache::lonhomework::results));
-    }
     #my $td=&tv_interval($t0);
   }
 }
@@ -269,9 +266,10 @@ sub renderpage {
 # with no arg it returns a HTML <option> list of the template titles
 # with one arg it returns the filename associated with the arg passed
 sub get_template_list {
-  my ($namewanted) = @_;
+  my ($namewanted,$extension) = @_;
   my $result;
-  foreach my $file (</home/httpd/html/res/adm/includes/templates/*.problem>) {
+  &Apache::lonxml::debug("Looking for :$extension:");
+  foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
     my $name=&Apache::lonnet::metadata($file,'title');
     if ($namewanted && ($name eq $namewanted)) {
       $result=$file;
@@ -286,20 +284,24 @@ sub get_template_list {
 sub newproblem {
   my ($request) = @_;
 
+  my $extension=$request->uri;
+  $extension=~s:^.*\.([\w]+)$:$1:;
+  &Apache::lonxml::debug("Looking for :$extension:");
   if ($ENV{'form.template'}) {
     use File::Copy;
-    my $file = &get_template_list($ENV{'form.template'});
+    my $file = &get_template_list($ENV{'form.template'},$extension);
     my $dest = &Apache::lonnet::filelocation("",$request->uri);
     copy($file,$dest);
     &renderpage($request,$file);
   } else {
-    my $templatelist=&get_template_list();
+    my $templatelist=&get_template_list('',$extension);
     my $url=$request->uri;
+    my $dest = &Apache::lonnet::filelocation("",$request->uri);
     $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">
-The request file $url doesn\'t exist. You can create a new problem <br />
+The request file $url doesn\'t exist. You can create a new $extension <br />
 <form action="$url" method="POST">
-<input type="submit" value="New Problem"><br />
+<input type="submit" value="New $extension"><br />
 <select name="template">
 $templatelist
 </select>
@@ -328,7 +330,7 @@ sub handler {
   #my $t0 = [&gettimeofday()];
   my $request=$_[0];
 
-  #if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
+  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
 
   if (&setupheader($request)) { return OK; }
   $ENV{'request.uri'}=$request->uri;
@@ -350,6 +352,10 @@ sub handler {
   }
 
   if ($ENV{'request.state'} eq "construct") {
+    if ($ENV{'form.resetdata'} eq 'Reset Submissions') {
+      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+      &Apache::lonnet::tmpreset($symb,'',$domain,$name);
+    }
     if ( -e $file ) {
       if (!(defined $ENV{'form.problemmode'})) {
 	#first visit to problem in construction space