--- loncom/homework/lonhomework.pm 2001/06/12 22:42:55 1.46 +++ loncom/homework/lonhomework.pm 2002/02/27 20:23:26 1.71 @@ -1,45 +1,78 @@ +# The LearningOnline Network with CAPA # The LON-CAPA Homework handler +# +# $Id: lonhomework.pm,v 1.71 2002/02/27 20:23:26 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; 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 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'}) { - 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 +117,8 @@ sub send_footer { } $Apache::lonxml::browse=''; -sub check_date { + +sub check_access { my ($id) = @_; my $date =''; my $status = ''; @@ -130,6 +164,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 +208,92 @@ 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 '' } +sub handle_save_or_undo { + my ($request,$problem,$result) = @_; + my $file = &Apache::lonnet::filelocation("",$request->uri); + my $filebak =$file.".bak"; + my $filetmp =$file.".tmp"; + my $error=0; + + if ($ENV{'form.Undo'} eq 'undo') { + 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 switch $filebak and $file

"); + $error=1; + } + } else { + my $fs=Apache::File->new(">$filebak"); + if (defined($fs)) { + print $fs $$problem; + $request->print("Making Backup to $filebak
"); + } else { + $request->print("Unable to make backup $filebak"); + $error=2; + } + my $fh=Apache::File->new(">$file"); + if (defined($fh)) { + print $fh $$result; + $request->print("Saving Modifications to $file
"); + } else { + $request->print("Unable to write to $file"); + $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.=' +
+ + + +
+ + +
+ +
'; + $request->print($result); + return ''; +} + 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); if ($problem == -1) { &Apache::lonxml::error(" Unable to find $file"); @@ -187,64 +304,49 @@ sub renderpage { my $result = ''; &Apache::inputtags::initialize_inputtags; &Apache::edit::initialize_edit; - %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=(); } 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 ($target eq 'grade') { &showhash(%Apache::lonhomework::history); } + #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); } my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm'); if ($default == -1) { &Apache::lonxml::error("Unable to find default_homework.lcpm"); $default=''; } + &Apache::lonxml::debug("Should be parsing now"); $result = &Apache::lonxml::xmlparse($target, $problem, $default.&setup_vars($target),%mystyle); #$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.="
Spent $td seconds processing target $target\n"; + #} $request->print($result); } #$request->print(":Result ends"); - if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); } - - #store new values - my ($temp) = keys %Apache::lonhomework::results; - if ( $temp ne '' ) { - &Apache::lonxml::debug("Store return message:". - &Apache::lonnet::cstore(\%Apache::lonhomework::results)); - } + #my $td=&tv_interval($t0); } } # with no arg it returns a HTML