--- loncom/homework/lonhomework.pm	2001/06/12 22:42:55	1.46
+++ loncom/homework/lonhomework.pm	2001/09/14 20:14:12	1.60
@@ -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,11 +10,12 @@ use Apache::lonxml;
 use Apache::lonnet;
 use Apache::inputtags;
 use Apache::structuretags;
+use Apache::randomlabel;
 use Apache::response;
 use Apache::hint;
 use Apache::outputtags;
 use Apache::Constants qw(:common);
-
+#use Time::HiRes qw( gettimeofday tv_interval );
 
 sub BEGIN {
   &Apache::lonxml::register_insert();
@@ -37,9 +38,9 @@ sub get_target {
     } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {
 	if ( defined $ENV{'form.submitted'}) {
-	  return ('grade', 'web');
+	  return ('grade', 'web','answer');
 	} else {
-	  return ('web');
+	  return ('web','answer');
 	}
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
 	if ( $ENV{'form.submitted'} eq 'edit' ) {
@@ -84,7 +85,8 @@ sub send_footer {
 }
 
 $Apache::lonxml::browse='';
-sub check_date {
+
+sub check_access {
   my ($id) = @_;
   my $date ='';
   my $status = '';
@@ -130,6 +132,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");
@@ -172,11 +181,41 @@ sub setupheader {
   return ''
 }
 
+sub handle_save_or_undo {
+  my ($request,$problem,$result) = @_;
+  my $fileout = &Apache::lonnet::filelocation("",$request->uri);
+  my $filesave=$fileout.".bak";
+
+  if ($ENV{'form.Undo'} eq 'undo') {
+    if (copy($filesave,$fileout)) {
+      $request->print("<b>Undid changes, Copied $filesave to $fileout<br /></b>");
+    } else {
+      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to undo, unable to copy $filesave to $fileout<br /></b></font>");
+    }
+  } else {
+    my $fs=Apache::File->new(">$filesave");
+    if (defined($fs)) {
+      print $fs $$problem;
+      $request->print("<b>Making Backup to $filesave</b><br />");
+    } else {
+      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filesave</b></font>");
+    }
+    my $fh=Apache::File->new(">$fileout");
+    if (defined($fh)) {
+      print $fh $$result;
+      $request->print("<b>Saving Modifications to $fileout</b><br />");
+    } else {
+      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $fileout</b></font>");
+    }
+  }
+}
+
 sub renderpage {
   my ($request,$file) = @_;
 
   my (@targets) = &get_target();
   foreach my $target (@targets) {
+    #my $t0 = [&gettimeofday()];
     my $problem=&Apache::lonnet::getfile($file);
     if ($problem == -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
@@ -187,15 +226,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 />");
 	}
@@ -214,37 +247,27 @@ sub renderpage {
 
     #$request->print("Result follows:");
     if ($target eq 'modified') {
-      my $fileout = &Apache::lonnet::filelocation("",$request->uri);
-      my $filesave=$fileout.".bak";
-
-      my $fs=Apache::File->new(">$filesave");
-      print $fs $problem;
-      $request->print("<b>Making Backup to $filesave</b><br />");
-
-      my $fh=Apache::File->new(">$fileout");
-      print $fh $result;
-      $request->print("<b>Saving Modifications to $fileout</b><br />");
+      &handle_save_or_undo($request,\$problem,\$result);
     } else {
+      #my $td=&tv_interval($t0);
+      #if ( $Apache::lonxml::debug) {
+	#$result =~ s:</body>::;
+	#$result.="<br />Spent $td seconds processing target $target\n</body>";
+      #}
       $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);
   }
 }
 
 # 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;
@@ -259,20 +282,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>
@@ -298,9 +325,10 @@ EDITMENU
 }
 
 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;
@@ -338,7 +366,8 @@ sub handler {
     # just render the page normally outside of construction space
     &renderpage($request,$file);
   }
-
+  #my $td=&tv_interval($t0);
+  #&Apache::lonxml::debug("Spent $td seconds processing");
   # &Apache::lonhomework::send_footer($request);
   # always turn off debug messages
   $Apache::lonxml::debug=0;