--- loncom/homework/lonhomework.pm 2001/05/21 19:45:28 1.44
+++ loncom/homework/lonhomework.pm 2001/11/29 18:36:59 1.63
@@ -1,7 +1,33 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
+#
+# $Id: lonhomework.pm,v 1.63 2001/11/29 18:36:59 albertel 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 Gerd Kortemeyer
+# 6/1,8/17,8/18 Gerd Kortemeyer
package Apache::lonhomework;
use strict;
@@ -10,11 +36,12 @@ use Apache::lonxml;
use Apache::lonnet;
use Apache::inputtags;
use Apache::structuretags;
+use Apache::randomlabel;
use Apache::response;
use Apache::hint;
use Apache::outputtags;
use Apache::Constants qw(:common);
-
+#use Time::HiRes qw( gettimeofday tv_interval );
sub BEGIN {
&Apache::lonxml::register_insert();
@@ -22,24 +49,25 @@ sub BEGIN {
sub get_target {
if ( $ENV{'request.state'} eq "published") {
- if ( defined $ENV{'form.submitted'}) {
+ 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'}) {
- return ('grade', 'web');
+ if ( defined($ENV{'form.submitted'}) &&
+ (!defined($ENV{'form.resetdata'})) ) {
+ return ('grade', 'web','answer');
} else {
- return ('web');
+ return ('web','answer');
}
} elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
if ( $ENV{'form.submitted'} eq 'edit' ) {
@@ -84,7 +112,8 @@ sub send_footer {
}
$Apache::lonxml::browse='';
-sub check_date {
+
+sub check_access {
my ($id) = @_;
my $date ='';
my $status = '';
@@ -130,6 +159,13 @@ sub check_date {
if ( $maxtries eq '' ) { $maxtries = '2'; }
if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
}
+
+ if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
+ (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
+ return ('UNCHECKEDOUT','needs to be checked out');
+ }
+
+
&Apache::lonxml::debug("sending back :$status:$datemsg:");
if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) {
&Apache::lonxml::debug("should be allowed to browse a resource when closed");
@@ -167,16 +203,47 @@ sub setupheader {
} else {
$request->content_type('text/html');
}
+ &Apache::loncommon::no_cache($request);
$request->send_http_header;
return OK if $request->header_only;
return ''
}
+sub handle_save_or_undo {
+ my ($request,$problem,$result) = @_;
+ my $fileout = &Apache::lonnet::filelocation("",$request->uri);
+ my $filesave=$fileout.".bak";
+
+ 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
");
+ }
+ } else {
+ my $fs=Apache::File->new(">$filesave");
+ if (defined($fs)) {
+ print $fs $$problem;
+ $request->print("Making Backup to $filesave
");
+ } else {
+ $request->print("Unable to make backup $filesave");
+ }
+ my $fh=Apache::File->new(">$fileout");
+ if (defined($fh)) {
+ print $fh $$result;
+ $request->print("Saving Modifications to $fileout
");
+ } else {
+ $request->print("Unable to write to $fileout");
+ }
+ }
+}
+
sub renderpage {
my ($request,$file) = @_;
my (@targets) = &get_target();
foreach my $target (@targets) {
+ #my $t0 = [&gettimeofday()];
my $problem=&Apache::lonnet::getfile($file);
if ($problem == -1) {
&Apache::lonxml::error(" Unable to find $file");
@@ -186,20 +253,15 @@ sub renderpage {
my %mystyle;
my $result = '';
&Apache::inputtags::initialize_inputtags;
- %Apache::lonhomework::results=();
- %Apache::lonhomework::history=&Apache::lonnet::restore();
- #ignore error conditions
- my ($temp)=keys %Apache::lonhomework::history ;
- if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
+ &Apache::edit::initialize_edit;
if ($target eq 'web') {
if (&Apache::lonnet::symbread() eq '') {
if ($ENV{'request.state'} eq "construct") {
- $request->print("In construction space, submissions ignored
");
} else {
$request->print("Browsing or ambiguous reference, submissions ignored
");
}
}
- if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
+ #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
}
if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
@@ -213,37 +275,27 @@ sub renderpage {
#$request->print("Result follows:");
if ($target eq 'modified') {
- my $fileout = &Apache::lonnet::filelocation("",$request->uri);
- my $filesave=$fileout.".bak";
-
- my $fs=Apache::File->new(">$filesave");
- print $fs $problem;
- $request->print("Making Backup to $filesave
");
-
- my $fh=Apache::File->new(">$fileout");
- print $fh $result;
- $request->print("Saving Modifications to $fileout
");
+ &handle_save_or_undo($request,\$problem,\$result);
} else {
+ #my $td=&tv_interval($t0);
+ #if ( $Apache::lonxml::debug) {
+ #$result =~ s:::;
+ #$result.="