--- loncom/homework/lonhomework.pm	2001/12/06 16:19:05	1.65
+++ loncom/homework/lonhomework.pm	2002/02/28 01:18:47	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.65 2001/12/06 16:19:05 matthew Exp $
+# $Id: lonhomework.pm,v 1.72 2002/02/28 01:18:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,7 @@ use strict;
 use Apache::style;
 use Apache::lonxml;
 use Apache::lonnet;
+use Apache::lonplot;
 use Apache::inputtags;
 use Apache::structuretags;
 use Apache::randomlabel;
@@ -43,12 +44,16 @@ use Apache::outputtags;
 use Apache::Constants qw(:common);
 #use Time::HiRes qw( gettimeofday tv_interval );
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register_insert();
 }
 
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
+    if ( defined($ENV{'form.grade_target'}) 
+	 && ($Apache::lonhomework::viewgrades == 'F' )) {
+      return ($ENV{'form.grade_target'});
+    }
     if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');
     } else {
@@ -203,7 +208,9 @@ sub setupheader {
   } else {
     $request->content_type('text/html');
   }
-  if (!$Apache::lonxml::debug) { &Apache::loncommon::no_cache($request); }
+  if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
+    &Apache::loncommon::no_cache($request);
+  }
   $request->send_http_header;
   return OK if $request->header_only;
   return ''
@@ -211,32 +218,37 @@ sub setupheader {
 
 sub handle_save_or_undo {
   my ($request,$problem,$result) = @_;
-  my $fileout = &Apache::lonnet::filelocation("",$request->uri);
-  my $filesave=$fileout.".bak";
+  my $file    = &Apache::lonnet::filelocation("",$request->uri);
+  my $filebak =$file.".bak";
+  my $filetmp =$file.".tmp";
   my $error=0;
 
   if ($ENV{'form.Undo'} eq 'undo') {
-    if (copy($filesave,$fileout)) {
-      $request->print("<b>Undid changes, Copied $filesave to $fileout<br /></b>");
+    my $error=0;
+    if (!copy($file,$filetmp)) { $error=1; }
+    if ((!$error) && (!copy($filebak,$file))) { $error=1; }
+    if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
+    if (!$error) {
+      $request->print("<p><b>Undid changes, Switched $filebak and $file</b></p>");
     } else {
-      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to undo, unable to copy $filesave to $fileout<br /></b></font>");
+      $request->print("<p><font color=\"red\" size=\"+1\"><b>Unable to undo, unable to switch $filebak and $file</b></font></p>");
       $error=1;
     }
   } else {
-    my $fs=Apache::File->new(">$filesave");
+    my $fs=Apache::File->new(">$filebak");
     if (defined($fs)) {
       print $fs $$problem;
-      $request->print("<b>Making Backup to $filesave</b><br />");
+      $request->print("<b>Making Backup to $filebak</b><br />");
     } else {
-      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filesave</b></font>");
+      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filebak</b></font>");
       $error=2;
     }
-    my $fh=Apache::File->new(">$fileout");
+    my $fh=Apache::File->new(">$file");
     if (defined($fh)) {
       print $fh $$result;
-      $request->print("<b>Saving Modifications to $fileout</b><br />");
+      $request->print("<b>Saving Modifications to $file</b><br />");
     } else {
-      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $fileout</b></font>");
+      $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $file</b></font>");
       $error|=4;
     }
   }
@@ -279,6 +291,7 @@ sub renderpage {
   my ($request,$file) = @_;
 
   my (@targets) = &get_target();
+  &Apache::lonxml::debug("Running targets ".join(':',@targets));
   foreach my $target (@targets) {
     #my $t0 = [&gettimeofday()];
     my $problem=&Apache::lonnet::getfile($file);
@@ -307,6 +320,7 @@ sub renderpage {
       &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
       $default='';
     }
+    &Apache::lonxml::debug("Should be parsing now");
     $result = &Apache::lonxml::xmlparse($target, $problem,
 			$default.&setup_vars($target),%mystyle);
 
@@ -359,7 +373,8 @@ sub newproblem {
 	# I don't like hard-coded filenames but for now, this will work.
 	use File::Copy;
 	my $templatefilename = 
-	    "/home/httpd/html/res/adm/includes/templates/blank.problem";
+	    $request->dir_config('lonIncludes').'/templates/blank.problem';
+	&Apache::lonxml::debug("$templatefilename");
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	copy($templatefilename,$dest);
 	&renderpage($request,$dest);
@@ -420,6 +435,15 @@ sub handler {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
   &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
+  # some times multiple problemmodes are submitted, need to select
+  # the last one
+  if ( defined($ENV{'form.problemmode'}) &&
+       defined(@{ $ENV{'form.problemmode'} })) {
+    &Apache::lonxml::debug("3Problem Modes ".$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);