--- loncom/homework/lonhomework.pm 2001/09/14 20:14:12 1.60 +++ loncom/homework/lonhomework.pm 2001/12/04 14:51:19 1.64 @@ -1,4 +1,30 @@ +# The LearningOnline Network with CAPA # The LON-CAPA Homework handler +# +# $Id: lonhomework.pm,v 1.64 2001/12/04 14:51:19 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,8/17,8/18 Gerd Kortemeyer @@ -23,21 +49,22 @@ 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'}) { + if ( defined($ENV{'form.submitted'}) && + (!defined($ENV{'form.resetdata'})) ) { return ('grade', 'web','answer'); } else { return ('web','answer'); @@ -176,6 +203,7 @@ sub setupheader { } else { $request->content_type('text/html'); } + if (!$Apache::lonxml::debug) { &Apache::loncommon::no_cache($request); } $request->send_http_header; return OK if $request->header_only; return '' @@ -185,12 +213,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 +229,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 +237,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.=' +
+ + + +
+ + +
+ +
'; + $request->print($result); + return ''; } sub renderpage { @@ -235,7 +300,7 @@ sub renderpage { } #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) { @@ -337,7 +402,7 @@ sub handler { $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); - + &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'}); my $file=&Apache::lonnet::filelocation("",$request->uri); #check if we know where we are @@ -350,11 +415,18 @@ sub handler { } if ($ENV{'request.state'} eq "construct") { + if ($ENV{'form.resetdata'} eq 'Reset Submissions') { + my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + &Apache::lonnet::tmpreset($symb,'',$domain,$name); + } if ( -e $file ) { if (!(defined $ENV{'form.problemmode'})) { #first visit to problem in construction space - &view_or_edit_menu($request); - #&renderpage($request,$file); + #&view_or_edit_menu($request); + $ENV{'form.problemmode'}='View'; + &renderpage($request,$file); + } elsif ($ENV{'form.problemmode'} eq 'EditXML') { + &editxmlmode($request,$file); } else { &renderpage($request,$file); }