--- loncom/homework/lonhomework.pm 2003/09/17 18:16:39 1.144
+++ loncom/homework/lonhomework.pm 2005/01/28 09:48:53 1.193
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.144 2003/09/17 18:16:39 albertel Exp $
+# $Id: lonhomework.pm,v 1.193 2005/01/28 09:48:53 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -24,11 +24,7 @@
# /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;
@@ -51,212 +47,341 @@ use Apache::externalresponse();
use Apache::rankresponse();
use Apache::matchresponse();
use Apache::chemresponse();
+use Apache::drawimage();
use Apache::Constants qw(:common);
use HTML::Entities();
use Apache::loncommon();
-#use Time::HiRes qw( gettimeofday tv_interval );
+use Apache::lonlocal;
+use Time::HiRes qw( gettimeofday tv_interval );
+use Apache::lonnet();
+
+# FIXME - improve commenting
+
BEGIN {
- &Apache::lonxml::register_insert();
+ &Apache::lonxml::register_insert();
}
+
+#
+# Decides what targets to render for.
+# Implicit inputs:
+# Various session environment variables:
+# request.state - published - is a /res/ resource
+# uploaded - is a /uploaded/ resource
+# contruct - is a /priv/ resource
+# form.grade_target - a form parameter requesting a specific target
sub get_target {
- 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'})) &&
- ( !defined($ENV{'form.newrandomization'}))) {
- 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');
- } else {
- return ('web');
- }
- } else {
- if ( $ENV{'form.problemmode'} eq 'View' ||
- $ENV{'form.problemmode'} eq 'Discard Edits and View') {
+ &Apache::lonxml::debug("request.state = $ENV{'request.state'}");
+ if( defined($ENV{'form.grade_target'})) {
+ &Apache::lonxml::debug("form.grade_target= $ENV{'form.grade_target'}");
+ } else {
+ &Apache::lonxml::debug("form.grade_target Undid changes, Switched $filebak and $file Unable to undo, unable to switch $filebak and $file ".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file ".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file Part '.$part.
- ' is not analyzable at this time '.&mt('Response').' '.$part.' '.
+ &mt('is not analyzable at this time').' Found no analyzable parts in this problem,
- currently only Numerical, Formula and String response
- styles are supported. '.&mt('Found no analyzable respones in this problem, currently only Numerical, Formula and String response styles are supported.').' You did not select a template. '.&mt('You did not select a template.').'
-To create a new $extension$instructions click on the "Create $extension" button.
+$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.
";
+ $string.= &showhashsubset($elm,'.');
} else {
$string.="$elm,"
}
@@ -267,50 +392,50 @@ sub showarray {
}
sub showhashsubset {
- my ($hash,$keyre) = @_;
- my $resultkey;
- foreach $resultkey (sort keys %$hash) {
- if ($resultkey =~ /$keyre/) {
- if (ref($$hash{$resultkey})) {
- if ($$hash{$resultkey} =~ /ARRAY/ ) {
+ my ($hash,$keyre) = @_;
+ my $resultkey;
+ foreach $resultkey (sort keys %$hash) {
+ if ($resultkey !~ /$keyre/) { next; }
+ if (ref($$hash{$resultkey}) eq 'ARRAY' ) {
&Apache::lonxml::debug("$resultkey ---- ".
&showarray($$hash{$resultkey}));
- } elsif ($$hash{$resultkey} =~ /HASH/ ) {
+ } elsif (ref($$hash{$resultkey}) eq '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 '';
+ }
+ &Apache::lonxml::debug("\n
restored values^\n");
+ return '';
}
sub setuppermissions {
- $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
- 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'}.
+ $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
+ 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 ''
+ }
+ $Apache::lonhomework::viewgrades = $viewgrades; # File global variable...dirt.
+ if ($Apache::lonhomework::browse eq 'F' &&
+ $ENV{'form.devalidatecourseresdata'} eq 'on') {
+ my (undef,$courseid) = &Apache::lonxml::whichuser();
+ &Apache::lonnet::devalidatecourseresdata($ENV{"course.$courseid.num"},
+ $ENV{"course.$courseid.domain"});
+ }
+ return ''
}
sub setupheader {
my $request=$_[0];
if ($ENV{'browser.mathml'}) {
- $request->content_type('text/xml');
+ &Apache::loncommon::content_type($request,'text/xml');
} else {
- $request->content_type('text/html');
+ &Apache::loncommon::content_type($request,'text/html');
}
- $request->content_encoding('UTF-8');
if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
&Apache::loncommon::no_cache($request);
}
@@ -320,58 +445,68 @@ sub setupheader {
}
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 ($request,$problem,$result) = @_;
+ my $file = &Apache::lonnet::filelocation("",$request->uri);
+ my $filebak =$file.".bak";
+ my $filetmp =$file.".tmp";
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("
");
- } 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
");
+
+ &Apache::lonnet::correct_line_ends($result);
+
+ if ($ENV{'form.Undo'} eq &mt('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) {
+ &Apache::lonxml::info("
'.&mt('List of possible answers').': ');
foreach my $part (sort(keys(%allparts))) {
if (defined(@{ $overall{$part.'.answer'} })) {
my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
- $request->print(' ');
+ $request->print('Part '.$part.'
');
} else {
- $request->print(' ');
my %frequency;
foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
$frequency{join("\0",@{ $answer })}++;
}
- $request->print(''.&mt('Part').' '.$part.' ');
+ $request->print('Answer Frequency ');
foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
$request->print(''.&mt('Answer').' '.&mt('Frequency').' '.
join(' ',split("\0",$answer)).
@@ -436,14 +574,12 @@ sub analyze {
}
$request->print('
';
+ if ($cols > 80) { $cols = 80; }
+ if ($cols < 70) { $cols = 70; }
+ if ($rows < 20) { $rows = 20; }
+ my $bodytag='';
+ if ($ENV{'environment.remote'} eq 'off') {
+ $bodytag=&Apache::loncommon::bodytag();
+ }
+ $result.=''.$bodytag.&Apache::lonxml::message_location().'
';
- $request->print($result);
- }
- return '';
+ &Apache::lonxml::add_messages(\$result);
+ $request->print($result);
+ }
+ return '';
}
+#
+# Render the page in whatever target desired.
+#
sub renderpage {
- my ($request,$file) = @_;
+ 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 eq -1) {
- &Apache::lonxml::error(" Unable to find $file");
- $problem='';
- }
+ my (@targets) = &get_target();
+ &Apache::lonhomework::showhashsubset(\%ENV,'form.');
+ &Apache::lonxml::debug("Running targets ".join(':',@targets));
+ my $overall_result;
+ foreach my $target (@targets) {
+ # FIXME need to do something intelligent when a problem goes
+ # from viewable to not viewable due to map conditions
+ #&setuppermissions();
+ #if ( $Apache::lonhomework::browse ne '2'
+ # && $Apache::lonhomework::browse ne 'F' ) {
+ # $request->print(" You most likely shouldn't see me.");
+ #}
+ #my $t0 = [&gettimeofday()];
+ my $problem=&Apache::lonnet::getfile($file);
+ if ($problem eq -1) {
+ &Apache::lonxml::error(" ".&mt('Unable to find')." $file");
+ $problem='';
+ }
- my %mystyle;
- my $result = '';
- 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') {
- &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.="'.
+ &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
+ "Problem Editing Help").
+ ' '.
+ &Apache::loncommon::help_open_menu('',undef,undef,undef,5,'Authoring').
+ '
Spent $td seconds processing target $target\n";
- #}
- $request->print($result);
- $request->rflush();
+ my %mystyle;
+ my $result = '';
+ 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') {
+ &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);
+ $overall_result.=$result;
+# $request->rflush();
+ }
+ #$request->print(":Result ends");
+ #my $td=&tv_interval($t0);
}
- #$request->print(":Result ends");
- #my $td=&tv_interval($t0);
- }
+ &Apache::lonxml::add_messages(\$overall_result);
+ $request->print($overall_result);
+ $request->rflush();
}
# with no arg it returns a HTML \n';
- }
- return $result;
+ if (@allnames && !$result) {
+ $result="\n';
+ }
+ return $result;
}
sub newproblem {
@@ -586,126 +749,140 @@ sub newproblem {
copy($templatefilename,$dest);
&renderpage($request,$dest);
} else {
- my $url=$request->uri;
+ my $url=&HTML::Entities::encode($request->uri,'<>&"');
+ my $shownurl=$url;
+ $shownurl=~s-^/~-/priv/-;
my $dest = &Apache::lonnet::filelocation("",$request->uri);
my $errormsg;
if ($ENV{'form.newfile'}) {
- $errormsg='
Then";}
+ my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
+ ($ENV{'environment.remote'} ne 'off'));
+ if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'
'.&mt("Then");}
+ my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
+ 'resource' => 'resource',
+ 'requested' => 'The requested file',
+ 'not exist' => 'currently does not exist',
+ 'createnew' => 'To create a new',
+ 'click' => 'click on the',
+ 'Create' => 'Create',
+ 'button' => 'button');
$request->print(<Creating a new $extension resource
+$bodytag
+$lt{'create'} $extension $lt{'resource'}
$errormsg
-The requested file $url currently does not exist.
+$lt{'requested'} $shownurl $lt{'not exist'}.
The server encountered an internal error or misconfiguration and was unable to complete your request.
Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.
More information about this error may be available in the server error log.
EDITMENU } sub handler { - #my $t0 = [&gettimeofday()]; - my $request=$_[0]; - - $Apache::lonxml::debug=$ENV{'user.debug'}; - - 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 - if ( &Apache::lonnet::mod_perl_version() == 2 ) { - &Apache::lonnet::cleanenv(); - } - $request->internal_redirect('/adm/ambiguous'); return; - } - } - - my ($symb) = &Apache::lonxml::whichuser(); - &Apache::lonxml::debug('symb is '.$symb); - if ($ENV{'request.state'} eq "construct" || $symb eq '') { - if ($ENV{'form.resetdata'} eq 'Reset Submissions' || - $ENV{'form.resetdata'} eq 'New Problem Variation' || - $ENV{'form.newrandomization'} eq 'New Randomization') { - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - &Apache::lonnet::tmpreset($symb,'',$domain,$name); -&Apache::lonxml::debug("Attempt reset"); - } - } - if ($ENV{'request.state'} eq "construct") { - if ( -e $file ) { - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['problemmode']); - 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 'Calculate answers') { - &analyze($request,$file); - } else { - &renderpage($request,$file); - } + #my $t0 = [&gettimeofday()]; + my $request=$_[0]; + + $Apache::lonxml::debug=$ENV{'user.debug'}; + $ENV{'request.uri'}=$request->uri; + &setuppermissions(); + # some times multiple problemmodes are submitted, need to select + # the last one + if ( defined($ENV{'form.problemmode'}) && ref($ENV{'form.problemmode'}) ) { + my $mode=$ENV{'form.problemmode'}->[-1]; + undef $ENV{'form.problemmode'}; + $ENV{'form.problemmode'}=$mode; + } + + 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' && + $ENV{'request.state'} ne "construct") { + #should know where we are, so ask + if ( &Apache::lonnet::mod_perl_version() == 2 ) { + &Apache::lonnet::cleanenv(); + } + &Apache::lonnet::logthis(&Apache::lonnet::mod_perl_version()); + $request->internal_redirect('/adm/ambiguous'); return OK; + } + } + if (&setupheader($request)) { return OK; } + &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); + &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'}); + my ($symb) = &Apache::lonxml::whichuser(); + &Apache::lonxml::debug('symb is '.$symb); + if ($ENV{'request.state'} eq "construct" || $symb eq '') { + if ($ENV{'form.resetdata'} eq &mt('Reset Submissions') || + $ENV{'form.resetdata'} eq &mt('New Problem Variation') || + $ENV{'form.newrandomization'} eq &mt('New Randomization')) { + my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + &Apache::lonnet::tmpreset($symb,'',$domain,$name); + &Apache::lonxml::debug("Attempt reset"); + } + } + if ($ENV{'request.state'} eq "construct") { + if ( -e $file ) { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['problemmode']); + 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 &mt('EditXML') || + $ENV{'form.problemmode'} eq 'EditXML') { + &editxmlmode($request,$file); + } elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) { + &analyze($request,$file); + } else { + &renderpage($request,$file); + } + } else { + # requested file doesn't exist in contruction space + &newproblem($request); + } } else { - # requested file doesn't exist in contruction space - &newproblem($request); + # just render the page normally outside of construction space + &Apache::lonxml::debug("not construct"); + &renderpage($request,$file); } - } else { - # just render the page normally outside of construction space - &Apache::lonxml::debug("not construct"); - &renderpage($request,$file); - } - #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; + #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; }