--- loncom/homework/lonhomework.pm 2001/12/21 20:06:25 1.67
+++ loncom/homework/lonhomework.pm 2002/02/27 20:23:26 1.71
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.67 2001/12/21 20:06:25 matthew Exp $
+# $Id: lonhomework.pm,v 1.71 2002/02/27 20:23:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,7 +44,7 @@ use Apache::outputtags;
use Apache::Constants qw(:common);
#use Time::HiRes qw( gettimeofday tv_interval );
-sub BEGIN {
+BEGIN {
&Apache::lonxml::register_insert();
}
@@ -208,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 ''
@@ -216,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("Undid changes, Copied $filesave to $fileout
");
+ 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("
Undid changes, Switched $filebak and $file
"); } else { - $request->print("Unable to undo, unable to copy $filesave to $fileoutUnable to undo, unable to switch $filebak and $file
"); $error=1; } } else { - my $fs=Apache::File->new(">$filesave"); + my $fs=Apache::File->new(">$filebak"); if (defined($fs)) { print $fs $$problem; - $request->print("Making Backup to $filesave