--- loncom/homework/lonhomework.pm 2001/04/16 23:16:31 1.40 +++ loncom/homework/lonhomework.pm 2002/08/07 18:20:29 1.85 @@ -1,40 +1,103 @@ +# The LearningOnline Network with CAPA # The LON-CAPA Homework handler +# +# $Id: lonhomework.pm,v 1.85 2002/08/07 18:20:29 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 +# 7/18 Jeremy Bowers package Apache::lonhomework; use strict; -use Apache::style; -use Apache::lonxml; -use Apache::lonnet; -use Apache::inputtags; -use Apache::structuretags; -use Apache::response; -use Apache::hint; -use Apache::outputtags; +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::caparesponse(); +use Apache::radiobuttonresponse(); +use Apache::optionresponse(); +use Apache::imageresponse(); +use Apache::essayresponse(); +use Apache::externalresponse(); use Apache::Constants qw(:common); +use HTML::Entities(); +use Apache::loncommon(); +#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.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.grade_target'}) ) { + return ($ENV{'form.grade_target'}); + } + if ( defined($ENV{'form.preview'})) { + if ( defined($ENV{'form.submitted'})) { return ('grade', 'web'); } else { return ('web'); } } else { - return ('grade','web'); - if ( $ENV{'form.submitted'} eq 'edit' ) { - return ('modified','edit'); + 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' ) { + if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { + return ('modified','web','answer'); + } else { + return ('modified','edit'); + } + } else { + return ('edit'); + } } else { - return ('edit'); + return ('web'); } } } @@ -50,7 +113,6 @@ sub setup_vars { sub send_header { my ($request)= @_; $request->print(&Apache::lontexconvert::header()); - $ENV{'request.uri'}=$request->uri; # $request->print('
'); } @@ -71,7 +133,8 @@ sub send_footer { } $Apache::lonxml::browse=''; -sub check_date { + +sub check_access { my ($id) = @_; my $date =''; my $status = ''; @@ -81,6 +144,7 @@ sub check_date { my $type; my $passed; &Apache::lonxml::debug("checking for part :$id:"); + &Apache::lonxml::debug("time:".time); foreach $temp ("opendate","duedate","answerdate") { $lastdate = $date; $date = &Apache::lonnet::EXT("resource.$id.$temp"); @@ -117,6 +181,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"); @@ -131,110 +202,354 @@ sub check_date { return ($status,$datemsg); } -sub handler { - my $request=$_[0]; - - if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} - - my (@targets) = &get_target(); +sub showhash { + my (%hash) = @_; + &showhashsubset(\%hash,''); + return ''; +} + +sub showhashsubset { + my ($hash,$keyre) = @_; + my $resultkey; + foreach $resultkey (sort keys %$hash) { + if ($resultkey =~ /$keyre/) { + if (ref($$hash{$resultkey})) { + if ($$hash{$resultkey} =~ /ARRAY/ ) { + my $string="$resultkey ---- ("; + foreach my $elm (@{ $$hash{$resultkey} }) { + $string.="$elm,"; + } + chop($string); + &Apache::lonxml::debug("$string)"); + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + } + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + } + } + } + &Apache::lonxml::debug("\n
restored values^
\n"); + return ''; +} +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; + return '' +} - #setup permissions - $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); - $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); - - #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; +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; +} - &Apache::lonhomework::send_header($request); - &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); - +sub analyze { + my ($request,$file) = @_; + &Apache::lonxml::debug("Analyze"); + my $result=&Apache::lonnet::ssi($request->uri,('grade_target' => 'analyze')); + &Apache::lonxml::debug(":$result:"); + (my $garbage,$result)=split(/_HASH_REF__/,$result,2); + &showhash(&Apache::lonnet::str2hash($result)); + return $result; +} + +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); } + } + &Apache::lonhomework::showhashsubset(\%ENV,'^form'); + if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { + &Apache::lonhomework::showhashsubset(\%ENV,'^form'); + $ENV{'form.problemmode'}='View'; + &renderpage($request,$file); + } else { + my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); + my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index"); + if ($cols > 80) { $cols = 80; } + $result.=' + + + + +
+ + + +
+ ' . $xml_help . ' Problem Help
+ +
'; + $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=(); } + &Apache::edit::initialize_edit; + if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); } if ($target eq 'web') { - if (&Apache::lonnet::symbread() eq '') { + my ($symb)=&Apache::lonxml::whichuser(); + if ($symb eq '') { if ($ENV{'request.state'} eq "construct") { - $request->print("In construction space, submissions ignored
"); } else { - $request->print("Browsing or ambiguous reference, submissions ignored
"); + my $help = Apache::loncommon::help_open_topic("Ambiguous_Reference"); + $request->print("Browsing or ambiguous reference, submissions ignored $help
"); } } - if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); } - } - if ($target eq 'grade') { - my $resultkey; - foreach $resultkey (sort keys %Apache::lonhomework::history) { - &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}"); - } - &Apache::lonxml::debug("\n
restored values^
\n"); + #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); } } + if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } + if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');} + 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=''; } - $result = &Apache::lonxml::xmlparse($target, $problem, + &Apache::lonxml::debug("Should be parsing now"); + $result = &Apache::lonxml::xmlparse($request, $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 { + if ($target eq 'analyze') { + $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze); + undef(%Apache::lonhomework::analyze); + } + #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 \n'; + } + return $result; +} + +sub newproblem { + my ($request) = @_; + my $extension=$request->uri; + $extension=~s:^.*\.([\w]+)$:$1:; + &Apache::lonxml::debug("Looking for :$extension:"); + if ($ENV{'form.template'} && + $ENV{'form.template'} ne "Select a $extension type") { + 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); + my $instructions; + if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";} + $request->print(< +The requested file $url doesn\'t exist.
+To create a new $extension$instructions click on the Create $extension button. +
+ENDNEWPROBLEM + if (defined($templatelist)) { + $request->print(""); + } + $request->print("
"); + $request->print("
"); } + 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:"); + # some times multiple problemmodes are submitted, need to select + # the last one + &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'}); + if ( defined($ENV{'form.problemmode'}) && + ref($ENV{'form.problemmode'}) ) { + &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'})); + my $mode=$ENV{'form.problemmode'}->[-1]; + undef $ENV{'form.problemmode'}; + $ENV{'form.problemmode'}=$mode; + } + &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); + } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') { + &analyze($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 + &Apache::lonxml::debug("not construct"); + &renderpage($request,$file); } - &Apache::lonhomework::send_footer($request); - # always turn of debug messages + #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;