--- loncom/homework/lonhomework.pm 2001/11/29 18:36:59 1.63
+++ loncom/homework/lonhomework.pm 2001/12/21 20:06:25 1.67
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.63 2001/11/29 18:36:59 albertel Exp $
+# $Id: lonhomework.pm,v 1.67 2001/12/21 20:06:25 matthew 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;
@@ -49,6 +50,10 @@ sub BEGIN {
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,7 @@ sub setupheader {
} else {
$request->content_type('text/html');
}
- &Apache::loncommon::no_cache($request);
+ if (!$Apache::lonxml::debug) { &Apache::loncommon::no_cache($request); }
$request->send_http_header;
return OK if $request->header_only;
return ''
@@ -213,12 +218,14 @@ sub handle_save_or_undo {
my ($request,$problem,$result) = @_;
my $fileout = &Apache::lonnet::filelocation("",$request->uri);
my $filesave=$fileout.".bak";
+ my $error=0;
if ($ENV{'form.Undo'} eq 'undo') {
if (copy($filesave,$fileout)) {
$request->print("Undid changes, Copied $filesave to $fileout
");
} else {
$request->print("Unable to undo, unable to copy $filesave to $fileout
");
+ $error=1;
}
} else {
my $fs=Apache::File->new(">$filesave");
@@ -227,6 +234,7 @@ sub handle_save_or_undo {
$request->print("Making Backup to $filesave
");
} else {
$request->print("Unable to make backup $filesave");
+ $error=2;
}
my $fh=Apache::File->new(">$fileout");
if (defined($fh)) {
@@ -234,8 +242,42 @@ sub handle_save_or_undo {
$request->print("Saving Modifications to $fileout
");
} else {
$request->print("Unable to write to $fileout");
+ $error|=4;
}
}
+ return $error;
+}
+
+sub editxmlmode {
+ my ($request,$file) = @_;
+ my $result;
+ my $problem=&Apache::lonnet::getfile($file);
+ if ($problem == -1) {
+ &Apache::lonxml::error(" Unable to find $file");
+ $problem='';
+ }
+ if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) {
+ my $error=&handle_save_or_undo($request,\$problem,
+ \$ENV{'form.editxmltext'});
+ if (!$error) { $problem=&Apache::lonnet::getfile($file); }
+ }
+ my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
+ if ($cols > 80) { $cols = 80; }
+ $result.='