--- loncom/homework/lonhomework.pm 2001/11/05 22:49:14 1.62 +++ loncom/homework/lonhomework.pm 2002/11/10 15:39:37 1.100 @@ -1,34 +1,81 @@ +# The LearningOnline Network with CAPA # The LON-CAPA Homework handler +# +# $Id: lonhomework.pm,v 1.100 2002/11/10 15:39:37 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 +# 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::randomlabel; -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 ); -sub BEGIN { +BEGIN { &Apache::lonxml::register_insert(); } sub get_target { if ( $ENV{'request.state'} eq "published") { + if ( defined($ENV{'form.grade_target'} ) + && ($ENV{'form.grade_target'} eq 'tex')) { + return ($ENV{'form.grade_target'}); + } elsif ( 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.grade_target'}) ) { + return ($ENV{'form.grade_target'}); + } if ( defined($ENV{'form.preview'})) { if ( defined($ENV{'form.submitted'})) { return ('grade', 'web'); @@ -36,7 +83,8 @@ sub get_target { return ('web'); } } else { - if ( $ENV{'form.problemmode'} eq 'View' ) { + if ( $ENV{'form.problemmode'} eq 'View' || + $ENV{'form.problemmode'} eq 'Discard Edits and View') { if ( defined($ENV{'form.submitted'}) && (!defined($ENV{'form.resetdata'})) ) { return ('grade', 'web','answer'); @@ -45,7 +93,11 @@ sub get_target { } } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) { if ( $ENV{'form.submitted'} eq 'edit' ) { - return ('modified','edit'); + if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { + return ('modified','web','answer'); + } else { + return ('modified','edit'); + } } else { return ('edit'); } @@ -87,6 +139,8 @@ sub send_footer { $Apache::lonxml::browse=''; +# JB, 9/24/2002: Any changes in this function may require a change +# in lonnavmaps::resource::getDateStatus. sub check_access { my ($id) = @_; my $date =''; @@ -97,9 +151,19 @@ sub check_access { 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"); + my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type"); + if ($thistype eq 'date_interval') { + if ($temp eq 'opendate') { + $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date; + } + if ($temp eq 'answerdate') { + $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date; + } + } &Apache::lonxml::debug("found :$date: for :$temp:"); if ($date eq '') { $date = "an unknown date"; $passed = 0; @@ -156,9 +220,30 @@ sub check_access { sub showhash { my (%hash) = @_; + &showhashsubset(\%hash,'.'); + return ''; +} + +sub showhashsubset { + my ($hash,$keyre) = @_; my $resultkey; - foreach $resultkey (sort keys %hash) { - &Apache::lonxml::debug("$resultkey ---- $hash{$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 ''; @@ -177,7 +262,9 @@ sub setupheader { } else { $request->content_type('text/html'); } - &Apache::loncommon::no_cache($request); + 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 '' @@ -185,37 +272,102 @@ sub setupheader { sub handle_save_or_undo { my ($request,$problem,$result) = @_; - my $fileout = &Apache::lonnet::filelocation("",$request->uri); - my $filesave=$fileout.".bak"; + my $file = &Apache::lonnet::filelocation("",$request->uri); + my $filebak =$file.".bak"; + my $filetmp =$file.".tmp"; + my $error=0; if ($ENV{'form.Undo'} eq 'undo') { - if (copy($filesave,$fileout)) { - $request->print("Undid changes, Copied $filesave to $fileout
"); + 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 copy $filesave to $fileout
"); + $request->print("

Unable to undo, unable to switch $filebak and $file

"); + $error=1; } } else { - my $fs=Apache::File->new(">$filesave"); + my $fs=Apache::File->new(">$filebak"); if (defined($fs)) { print $fs $$problem; - $request->print("Making Backup to $filesave
"); + $request->print("Making Backup to $filebak
"); } else { - $request->print("Unable to make backup $filesave"); + $request->print("Unable to make backup $filebak"); + $error=2; } - my $fh=Apache::File->new(">$fileout"); + my $fh=Apache::File->new(">$file"); if (defined($fh)) { print $fh $$result; - $request->print("Saving Modifications to $fileout
"); + $request->print("Saving Modifications to $file
"); } else { - $request->print("Unable to write to $fileout"); + $request->print("Unable to write to $file"); + $error|=4; } } + return $error; +} + +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; } + if ($cols < 70) { $cols = 70; } + if ($rows < 20) { $rows = 20; } + $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 $t0 = [&gettimeofday()]; my $problem=&Apache::lonnet::getfile($file); @@ -226,31 +378,25 @@ sub renderpage { my %mystyle; my $result = ''; - &Apache::inputtags::initialize_inputtags; - &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
"); - } - } - #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=''; - } - $result = &Apache::lonxml::xmlparse($target, $problem, - $default.&setup_vars($target),%mystyle); + &Apache::inputtags::initialize_inputtags(); + &Apache::outputtags::initialize_outputtags(); + &Apache::edit::initialize_edit(); + if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); } + if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } + if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');} + + &Apache::lonxml::debug("Should be parsing now"); + $result = &Apache::lonxml::xmlparse($request, $target, $problem, + &setup_vars($target),%mystyle); #$request->print("Result follows:"); if ($target eq 'modified') { &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:::; @@ -268,6 +414,7 @@ sub renderpage { sub get_template_list { my ($namewanted,$extension) = @_; my $result; + my @allnames; &Apache::lonxml::debug("Looking for :$extension:"); foreach my $file () { my $name=&Apache::lonnet::metadata($file,'title'); @@ -275,42 +422,56 @@ sub get_template_list { $result=$file; last; } else { - $result.=""; + push (@allnames, $name); } } + if (@allnames && !$result) { + $result="\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'}) { - use File::Copy; - my $file = &get_template_list($ENV{'form.template'},$extension); - my $dest = &Apache::lonnet::filelocation("",$request->uri); - copy($file,$dest); - &renderpage($request,$file); - } else { - my $templatelist=&get_template_list('',$extension); - my $url=$request->uri; - my $dest = &Apache::lonnet::filelocation("",$request->uri); - $request->print(<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 request file $url doesn\'t exist. You can create a new $extension
+The requested file $url doesn\'t exist.
+To create a new $extension$instructions click on the Create $extension button.
-
- -
- ENDNEWPROBLEM - } - - return ''; + if (defined($templatelist)) { + $request->print(""); + } + $request->print("
"); + $request->print(""); + } + return ''; } sub view_or_edit_menu { @@ -330,7 +491,8 @@ sub handler { #my $t0 = [&gettimeofday()]; my $request=$_[0]; - if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} +# if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} + $Apache::lonxml::debug=$ENV{'user.debug'}; if (&setupheader($request)) { return OK; } $ENV{'request.uri'}=$request->uri; @@ -339,7 +501,17 @@ 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:"); - + # 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 @@ -359,8 +531,13 @@ sub handler { 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); + } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') { + &analyze($request,$file); } else { &renderpage($request,$file); } @@ -370,6 +547,7 @@ sub handler { } } else { # just render the page normally outside of construction space + &Apache::lonxml::debug("not construct"); &renderpage($request,$file); } #my $td=&tv_interval($t0);