--- loncom/homework/lonhomework.pm 2001/06/12 22:42:55 1.46
+++ loncom/homework/lonhomework.pm 2003/05/19 21:05:23 1.130
@@ -1,49 +1,108 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
+#
+# $Id: lonhomework.pm,v 1.130 2003/05/19 21:05:23 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::rankresponse();
+use Apache::matchresponse();
+#use Apache::chemresponse();
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.submitted'}) {
+ if (($ENV{'request.state'} eq "published") ||
+ ($ENV{'request.state'} eq "uploaded")) {
+ 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 eq 'F' )) {
+ return ($ENV{'form.grade_target'});
+ }
+
+ if ( defined($ENV{'form.submitted'}) &&
+ ( !defined($ENV{'form.resetdata'}))) {
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 {
- if ( $ENV{'form.problemmode'} eq 'View' ) {
- if ( defined $ENV{'form.submitted'}) {
- return ('grade', 'web');
+ 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');
} else {
- return ('web');
+ return ('web','answer');
}
} 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');
}
@@ -84,19 +143,46 @@ sub send_footer {
}
$Apache::lonxml::browse='';
-sub check_date {
+
+# JB, 9/24/2002: Any changes in this function may require a change
+# in lonnavmaps::resource::getDateStatus.
+sub check_access {
my ($id) = @_;
my $date ='';
- my $status = '';
+ my $status;
my $datemsg = '';
my $lastdate = '';
my $temp;
my $type;
my $passed;
+
+ if ($ENV{'request.state'} eq "construct") {
+ &Apache::lonxml::debug("in construction ignoring dates");
+ $status='CAN_ANSWER';
+ $datemsg='is in under construction';
+ return ($status,$datemsg);
+ }
+
&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 =~ /^(con_lost|no_such_host)/ ||
+ $date =~ /^(con_lost|no_such_host)/) {
+ $status='UNAVAILABLE';
+ $date="may open later.";
+ return($status,$date);
+ }
+ 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;
@@ -123,32 +209,80 @@ sub check_date {
$datemsg = "was due on $lastdate, and answers will be available on $date";
}
if ($status eq 'CAN_ANSWER') {
- #check #tries
+ #check #tries, and if correct.
my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
if ( $tries eq '' ) { $tries = '0'; }
if ( $maxtries eq '' ) { $maxtries = '2'; }
- if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
+ if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
+ # if (correct and show prob status) or excused then CANNOT_ANSWER
+ if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
+ &&
+ lc($Apache::lonhomework::problemstatus) ne 'no')
+ ||
+ $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
+ $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';
- $datemsg='is in under construction';
- }
+
return ($status,$datemsg);
}
sub showhash {
my (%hash) = @_;
+ &showhashsubset(\%hash,'.');
+ return '';
+}
+
+sub showarray {
+ my ($array)=@_;
+ my $string="(";
+ foreach my $elm (@{ $array }) {
+ if (ref($elm)) {
+ if ($elm =~ /ARRAY/ ) {
+ $string.=&showarray($elm);
+ }
+ } else {
+ $string.="$elm,"
+ }
+ }
+ chop($string);
+ $string.=")";
+ return $string;
+}
+
+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/ ) {
+ &Apache::lonxml::debug("$resultkey ---- ".
+ &showarray($$hash{$resultkey}));
+ } elsif ($$hash{$resultkey} =~ /HASH/ ) {
+ &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
+ &showhashsubset($$hash{$resultkey},'.');
+ } else {
+ &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
+ }
+ } else {
+ &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
+ }
+ }
}
&Apache::lonxml::debug("\n
restored values^\n");
return '';
@@ -156,132 +290,322 @@ sub showhash {
sub setuppermissions {
$Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
- $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+ my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+ if (! $viewgrades &&
+ exists($ENV{'request.course.sec'}) &&
+ $ENV{'request.course.sec'} !~ /^\s*$/) {
+ $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.
+ '/'.$ENV{'request.course.sec'});
+ }
+ $Apache::lonhomework::viewgrades = $viewgrades;
return ''
}
sub setupheader {
- my $request=$_[0];
- if ($ENV{'browser.mathml'}) {
- $request->content_type('text/xml');
+ my $request=$_[0];
+ if ($ENV{'browser.mathml'}) {
+ $request->content_type('text/xml');
+ } else {
+ $request->content_type('text/html');
+ }
+ $request->content_encoding('UTF-8');
+ 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 {
- $request->content_type('text/html');
+ 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;
+ }
}
- $request->send_http_header;
- return OK if $request->header_only;
- return ''
+ return $error;
+}
+
+sub analyze_header {
+ my ($request) = @_;
+ my $result.='
+ Analyzing a problem
+
+ ';
+ $request->print($result);
+ $request->rflush();
+}
+
+sub analyze_footer {
+ my ($request) = @_;
+ my $result='';
+ $request->print($result);
+ $request->rflush();
+}
+
+sub analyze {
+ my ($request,$file) = @_;
+ &Apache::lonxml::debug("Analyze");
+ my $result;
+ my %overall;
+ my %allparts;
+ my $rndseed=$ENV{'form.rndseed'};
+ &analyze_header($request);
+ my %prog_state=
+ &Apache::lonhtmlcommon::Create_PrgWin($request,'Analyze Progress',
+ 'Getting Problem Variants',
+ $ENV{'form.numtoanalyze'});
+ for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
+ &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
+ 'last problem');
+ my $subresult=&Apache::lonnet::ssi($request->uri,
+ ('grade_target' => 'analyze'),
+ ('rndseed' => $i+$rndseed));
+ &Apache::lonxml::debug(":$subresult:");
+ (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
+ my %analyze=&Apache::lonnet::str2hash($subresult);
+ my @parts;
+ if (defined(@{ $analyze{'parts'} })) {
+ @parts=@{ $analyze{'parts'} };
+ }
+ foreach my $part (@parts) {
+ if (!exists($allparts{$part})) {$allparts{$part}=1;};
+ if ($analyze{$part.'.type'} eq 'numericalresponse' ||
+ $analyze{$part.'.type'} eq 'stringresponse' ||
+ $analyze{$part.'.type'} eq 'formularesponse' ) {
+ push( @{ $overall{$part.'.answer'} },
+ [@{ $analyze{$part.'.answer'} }]);
+ }
+ }
+ }
+ &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
+ 'Analyzing Results');
+ foreach my $part (keys(%allparts)) {
+ if (defined(@{ $overall{$part.'.answer'} })) {
+ $request->print('| Part '.$part.' |
');
+ my %frequency;
+ foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
+ $frequency{join('\0',@{ $answer })}++;
+ }
+ foreach my $answer (sort {(split('\0',$a))[0] <=> (split('\0',$b))[0]} (keys(%frequency))) {
+ $request->print('| '.
+ join(' | ',split('\0',$answer)).
+ ' | ('.$frequency{$answer}.
+ ') |
');
+ }
+ $request->print('
');
+ } else {
+ $request->print('Part '.$part.
+ ' is not analyzable at this time
');
+ }
+ }
+ if (scalar(keys(%allparts)) == 0 ) {
+ $request->print('Found no analyzable parts in this problem,
+ currently only Numerical, Formula and String response
+ styles are supported.
');
+ }
+ &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
+ &analyze_footer($request);
+ &Apache::lonhomework::showhash(%overall);
+ return $result;
+}
+
+sub editxmlmode {
+ my ($request,$file) = @_;
+ my $result;
+ my $problem=&Apache::lonnet::getfile($file);
+ if ($problem eq -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",'Problem Editing Help')
+ .' | '.
+ &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+ undef,undef,600)
+ .' | '.
+ &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+ undef,undef,600)
+ .' |
';
+ if ($cols > 80) { $cols = 80; }
+ if ($cols < 70) { $cols = 70; }
+ if ($rows < 20) { $rows = 20; }
+ $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) {
+ if ($problem eq -1) {
&Apache::lonxml::error(" Unable to find $file");
$problem='';
}
my %mystyle;
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); }
-
- 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);
-
+ if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); }
+ 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);
+ undef($Apache::lonhomework::parsing_a_problem);
#$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.="