--- loncom/homework/lonhomework.pm	2002/01/17 12:23:31	1.69
+++ loncom/homework/lonhomework.pm	2002/03/22 20:11:00	1.73
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.69 2002/01/17 12:23:31 harris41 Exp $
+# $Id: lonhomework.pm,v 1.73 2002/03/22 20:11:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,17 +31,18 @@
 
 package Apache::lonhomework;
 use strict;
-use Apache::style;
-use Apache::lonxml;
-use Apache::lonnet;
-use Apache::lonplot;
-use Apache::inputtags;
-use Apache::structuretags;
-use Apache::randomlabel;
-use Apache::response;
-use Apache::hint;
-use Apache::outputtags;
+use Apache::style();
+use Apache::lonxml();
+use Apache::lonnet();
+use Apache::lonplot();
+use Apache::inputtags();
+use Apache::structuretags();
+use Apache::randomlabel();
+use Apache::response();
+use Apache::hint();
+use Apache::outputtags();
 use Apache::Constants qw(:common);
+use HTML::Entities();
 #use Time::HiRes qw( gettimeofday tv_interval );
 
 BEGIN {
@@ -128,6 +129,7 @@ sub check_access {
   my $type;
   my $passed;
   &Apache::lonxml::debug("checking for part :$id:");
+  &Apache::lonxml::debug("time:".time);
   foreach $temp ("opendate","duedate","answerdate") {
     $lastdate = $date;
     $date = &Apache::lonnet::EXT("resource.$id.$temp");
@@ -189,7 +191,20 @@ sub showhash {
   my (%hash) = @_;
   my $resultkey;
   foreach $resultkey (sort keys %hash) {
-    &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+    if (ref($hash{$resultkey})) {
+      if ($hash{$resultkey} =~ /ARRAY/ ) {
+	my $string="$resultkey ---- (";
+	foreach my $elm (@{ $hash{$resultkey} }) {
+	  $string.="$elm,";
+	}
+	chop($string);
+	&Apache::lonxml::debug("$string)");
+      } else {
+	&Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+      }
+    } else {
+      &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+    }
   }
   &Apache::lonxml::debug("\n<br />restored values^</br>\n");
   return '';
@@ -218,32 +233,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;
     }
   }
@@ -276,7 +296,7 @@ sub editxmlmode {
             <input type="submit" name="Undo" value="undo" />
             <hr />
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
-	      $problem.'</textarea>
+	      &HTML::Entities::encode($problem).'</textarea>
             </form></body></html>';
   $request->print($result);
   return '';
@@ -286,6 +306,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);
@@ -314,6 +335,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);
 
@@ -428,6 +450,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);