--- loncom/homework/lonhomework.pm 2001/01/11 15:20:58 1.31 +++ loncom/homework/lonhomework.pm 2002/01/30 17:39:13 1.70 @@ -1,38 +1,88 @@ +# The LearningOnline Network with CAPA # The LON-CAPA Homework handler +# +# $Id: lonhomework.pm,v 1.70 2002/01/30 17:39:13 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 ); + +BEGIN { + &Apache::lonxml::register_insert(); +} sub get_target { if ( $ENV{'request.state'} eq "published") { - if ( defined $ENV{'form.submit'}) { + 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.submit'}) { + if ( defined($ENV{'form.preview'})) { + if ( defined($ENV{'form.submitted'})) { return ('grade', 'web'); } else { return ('web'); } } else { - #return ('edit'); - #edit is currently broken - return ('web'); + if ( $ENV{'form.problemmode'} eq 'View' ) { + if ( defined($ENV{'form.submitted'}) && + (!defined($ENV{'form.resetdata'})) ) { + return ('grade', 'web','answer'); + } else { + return ('web','answer'); + } + } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) { + if ( $ENV{'form.submitted'} eq 'edit' ) { + return ('modified','edit'); + } else { + return ('edit'); + } + } else { + return ('web'); + } } } return (); @@ -47,19 +97,28 @@ sub setup_vars { sub send_header { my ($request)= @_; $request->print(&Apache::lontexconvert::header()); - $ENV{'request.uri'}=$request->uri; # $request->print('
'); } +sub createmenu { + my ($which,$request)=@_; + if ($which eq 'grade') { + $request->print(''); + } +} + sub send_footer { my ($request)= @_; # $request->print('
'); $request->print(&Apache::lontexconvert::footer()); } -#@Apache::lonhomework::date_status=(); -#@Apache::lonhomework::date_msg=(); -sub check_date { +$Apache::lonxml::browse=''; + +sub check_access { my ($id) = @_; my $date =''; my $status = ''; @@ -95,7 +154,7 @@ sub check_date { $datemsg = "is due at $date"; } elsif ($type eq 'answerdate') { $status='CLOSED'; - $datemsg = "was due as $lastdate, and answers will be available at $date"; + $datemsg = "was due on $lastdate, and answers will be available on $date"; } if ($status eq 'CAN_ANSWER') { #check #tries @@ -105,7 +164,19 @@ 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"); + $status='CAN_ANSWER'; + $datemsg='is closed but you are allowed to view it'; + } if ($ENV{'request.state'} eq "construct") { &Apache::lonxml::debug("in construction ignoring dates"); $status='CAN_ANSWER'; @@ -114,78 +185,297 @@ sub check_date { return ($status,$datemsg); } -sub handler { - my $request=$_[0]; +sub showhash { + my (%hash) = @_; + my $resultkey; + foreach $resultkey (sort keys %hash) { + &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}"); + } + &Apache::lonxml::debug("\n
restored values^
\n"); + return ''; +} - if ( $ENV{'user.name'} eq 'albertel' ) { $Apache::lonxml::debug=1; } - - my (@targets) = &get_target(); +sub setuppermissions { + $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); + $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); + return '' +} +sub setupheader { + my $request=$_[0]; if ($ENV{'browser.mathml'}) { $request->content_type('text/xml'); } 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; - - &Apache::lonhomework::send_header($request); - - #check if allowed to see - + 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 $file=&Apache::lonnet::filelocation("",$request->uri); + #my $t0 = [&gettimeofday()]; my $problem=&Apache::lonnet::getfile($file); if ($problem == -1) { &Apache::lonxml::error(" Unable to find $file"); $problem=''; } - + 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=(); } - if ($target eq 'web' && &Apache::lonnet::symbread() eq '') { - $request->print("Vieiwing this problem as not a student, submissions will be ignored."); - } - if ($target eq 'grade') { - my $resultkey; - foreach $resultkey (sort keys %Apache::lonhomework::history) { - &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}"); + &Apache::edit::initialize_edit; + if ($target eq 'web') { + if (&Apache::lonnet::symbread() eq '') { + if ($ENV{'request.state'} eq "construct") { + } else { + $request->print("Browsing or ambiguous reference, submissions ignored
"); + } } - &Apache::lonxml::debug("\n
restored values^
\n"); + #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); } } + #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:"); - $request->print($result); + if ($target eq 'modified') { + &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') { + #my $td=&tv_interval($t0); + } +} - my $resultkey; - foreach $resultkey (sort keys %Apache::lonhomework::results) { - &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}"); - } - &Apache::lonxml::debug("\n
storing values^
\n"); +# with no arg it returns a HTML "; } - - my ($temp) = keys %Apache::lonhomework::results; - if ( $temp ne '' ) { - &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(%Apache::lonhomework::results)); + } + return $result; +} + +sub newproblem { + my ($request) = @_; + my $extension=$request->uri; + $extension=~s:^.*\.([\w]+)$:$1:; + &Apache::lonxml::debug("Looking for :$extension:"); + if ($ENV{'form.template'}) { + use File::Copy; + my $file = &get_template_list($ENV{'form.template'},$extension); + my $dest = &Apache::lonnet::filelocation("",$request->uri); + copy($file,$dest); + &renderpage($request,$dest); + } elsif($ENV{'form.newfile'}) { + # I don't like hard-coded filenames but for now, this will work. + use File::Copy; + my $templatefilename = + $request->dir_config('lonIncludes').'/templates/blank.problem'; + &Apache::lonxml::debug("$templatefilename"); + my $dest = &Apache::lonnet::filelocation("",$request->uri); + copy($templatefilename,$dest); + &renderpage($request,$dest); + }else { + my $templatelist=&get_template_list('',$extension); + my $url=$request->uri; + my $dest = &Apache::lonnet::filelocation("",$request->uri); + if (!defined($templatelist)) { + # We didn't find a template, so just create a blank problem. + $request->print(< +The requested file $url doesn\'t exist. You can create a new $extension
+
+
+
+ +ENDNEWPROBLEM + return ''; + } + $request->print(< +The requested file $url doesn\'t exist. You can create a new $extension
+
+
+ +
+ +ENDNEWPROBLEM } + return ''; +} + +sub view_or_edit_menu { + my ($request) = @_; + my $url=$request->uri; + $request->print(< +
+Would you like to or + the problem. +
+ +EDITMENU +} + +sub handler { + #my $t0 = [&gettimeofday()]; + my $request=$_[0]; + + if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} + + if (&setupheader($request)) { return OK; } + $ENV{'request.uri'}=$request->uri; + + #setup permissions + $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 + if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { + # if we are browsing we might not be able to know where we are + if ($Apache::lonhomework::browse ne 'F') { + #should know where we are, so ask + $request->internal_redirect('/adm/ambiguous'); return; + } + } + + 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); + $ENV{'form.problemmode'}='View'; + &renderpage($request,$file); + } elsif ($ENV{'form.problemmode'} eq 'EditXML') { + &editxmlmode($request,$file); + } else { + &renderpage($request,$file); + } + } else { + # requested file doesn't exist in contruction space + &newproblem($request); + } + } else { + # just render the page normally outside of construction space + &renderpage($request,$file); } - &Apache::lonhomework::send_footer($request); - + #my $td=&tv_interval($t0); + #&Apache::lonxml::debug("Spent $td seconds processing"); + # &Apache::lonhomework::send_footer($request); + # always turn off debug messages + $Apache::lonxml::debug=0; return OK; }