--- loncom/homework/lonhomework.pm 2004/02/16 17:20:39 1.165
+++ loncom/homework/lonhomework.pm 2006/02/16 01:25:33 1.233.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.165 2004/02/16 17:20:39 albertel Exp $
+# $Id: lonhomework.pm,v 1.233.2.1 2006/02/16 01:25:33 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,7 +30,7 @@ package Apache::lonhomework;
use strict;
use Apache::style();
use Apache::lonxml();
-use Apache::lonnet();
+use Apache::lonnet;
use Apache::lonplot();
use Apache::inputtags();
use Apache::structuretags();
@@ -47,63 +47,87 @@ 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 Apache::lonlocal;
-#use Time::HiRes qw( gettimeofday tv_interval );
+use Time::HiRes qw( gettimeofday tv_interval );
+use Apache::lonnet();
+
+# FIXME - improve commenting
+
BEGIN {
&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::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 '.&mt('Found no analyzable respones in this problem, currently only Numerical, Formula and String response styles are supported.').' '.&mt('Found no analyzable responses in this problem, currently only Numerical, Formula and String response styles are supported.').'
'.&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('
';
+ &Apache::loncommon::help_open_menu('',undef,undef,undef,5,'Authoring').
+ '';
if ($cols > 80) { $cols = 80; }
if ($cols < 70) { $cols = 70; }
if ($rows < 20) { $rows = 20; }
- $result.='
- ';
+ &Apache::lonxml::add_messages(\$result);
$request->print($result);
}
return '';
}
+#
+# Render the page in whatever target desired.
+#
sub renderpage {
- my ($request,$file) = @_;
+ my ($request,$file,$targets,$return_string) = @_;
- my (@targets) = &get_target();
- &Apache::lonhomework::showhashsubset(\%ENV,'form.');
+ my @targets = @{$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 $output=1;
+ if ($target eq 'no_output_web') {
+ $target = 'web'; $output=0;
+ }
my $problem=&Apache::lonnet::getfile($file);
+ my $result;
if ($problem eq -1) {
- &Apache::lonxml::error(" ".&mt('Unable to find')." $file");
+ my $filename=(split('/',$file))[-1];
+ $result.=" ".&mt('Unable to find')." $filename";
$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');}
+ 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);
+ $result .= &Apache::lonxml::xmlparse($request, $target, $problem,
+ &setup_vars($target),%mystyle);
undef($Apache::lonhomework::parsing_a_problem);
+ if (!$output) { $result = ''; }
#$request->print("Result follows:");
if ($target eq 'modified') {
&handle_save_or_undo($request,\$problem,\$result);
@@ -601,12 +847,20 @@ sub renderpage {
#$result =~ s:::;
#$result.=" ');
+ $request->print(''.&mt('Part').' '.$part.'
');
} else {
@@ -506,7 +723,7 @@ sub analyze {
}
}
if (scalar(keys(%allparts)) == 0 ) {
- $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(''.&mt('Answer').' '.&mt('Frequency').' ');
foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
- $request->print(''.&mt('Answer').' '.&mt('Frequency').'
('
+ .&mt('click for example').') ');
+ $request->print(''.
- join(' ',split("\0",$answer)).
- ' ('.$frequency{$answer}.
- ') ');
}
$request->print(''.
+ join(' ',split("\0",$answer)).
+ ' '.$frequency{$answer}.
+ ' '.
- &Apache::loncommon::help_open_faq(5).
- &Apache::loncommon::help_open_bug('Authoring').'
Spent $td seconds processing target $target\n";
#}
- $request->print($result);
- $request->rflush();
+# $request->print($result);
+ $overall_result.=$result;
+# $request->rflush();
}
#$request->print(":Result ends");
#my $td=&tv_interval($t0);
}
+ if (!$return_string) {
+ &Apache::lonxml::add_messages(\$overall_result);
+ $request->print($overall_result);
+ $request->rflush();
+ } else {
+ return $overall_result;
+ }
}
# with no arg it returns a HTML
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.
@@ -715,63 +970,56 @@ 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:"); + $Apache::lonxml::request=$request; + $Apache::lonxml::debug=$env{'user.debug'}; + $env{'request.uri'}=$request->uri; + &setuppermissions(); # 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; + if ( defined($env{'form.problemmode'}) && ref($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 ($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') { + 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(); - } - $request->internal_redirect('/adm/ambiguous'); return; + $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')) { + 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 ($env{'request.state'} eq "construct") { if ( -e $file ) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['problemmode']); - if (!(defined $ENV{'form.problemmode'})) { + if (!(defined $env{'form.problemmode'})) { #first visit to problem in construction space #&view_or_edit_menu($request); - $ENV{'form.problemmode'}='View'; + $env{'form.problemmode'}='View'; &renderpage($request,$file); - } elsif ($ENV{'form.problemmode'} eq &mt('EditXML')) { + } elsif ($env{'form.problemmode'} eq &mt('EditXML') || + $env{'form.problemmode'} eq 'EditXML') { &editxmlmode($request,$file); - } elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) { + } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) { &analyze($request,$file); } else { &renderpage($request,$file);