--- loncom/homework/lonhomework.pm 2001/09/14 20:14:12 1.60
+++ loncom/homework/lonhomework.pm 2002/01/17 12:23:31 1.69
@@ -1,4 +1,30 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
+#
+# $Id: lonhomework.pm,v 1.69 2002/01/17 12:23:31 harris41 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# Guy Albertelli
# 11/30 Gerd Kortemeyer
# 6/1,8/17,8/18 Gerd Kortemeyer
@@ -8,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;
@@ -17,27 +44,32 @@ 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.submitted'}) {
+ if ( defined($ENV{'form.grade_target'})
+ && ($Apache::lonhomework::viewgrades == 'F' )) {
+ return ($ENV{'form.grade_target'});
+ }
+ if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
} else {
return ('web');
}
} elsif ($ENV{'request.state'} eq "construct") {
- if ( defined $ENV{'form.preview'}) {
- if ( defined $ENV{'form.submitted'}) {
+ if ( defined($ENV{'form.preview'})) {
+ if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
} else {
return ('web');
}
} else {
if ( $ENV{'form.problemmode'} eq 'View' ) {
- if ( defined $ENV{'form.submitted'}) {
+ if ( defined($ENV{'form.submitted'}) &&
+ (!defined($ENV{'form.resetdata'})) ) {
return ('grade', 'web','answer');
} else {
return ('web','answer');
@@ -176,6 +208,9 @@ sub setupheader {
} else {
$request->content_type('text/html');
}
+ 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 ''
@@ -185,12 +220,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");
@@ -199,6 +236,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)) {
@@ -206,8 +244,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.='