--- loncom/homework/structuretags.pm 2004/07/02 08:14:41 1.259
+++ loncom/homework/structuretags.pm 2005/11/04 15:34:32 1.315
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.259 2004/07/02 08:14:41 albertel Exp $
+# $Id: structuretags.pm,v 1.315 2005/11/04 15:34:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,7 +36,7 @@ use Apache::File();
use Apache::lonmenu;
use Apache::lonlocal;
use Apache::lonxml;
-
+use Time::HiRes qw( gettimeofday tv_interval );
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
}
@@ -68,6 +68,33 @@ sub end_tex {
return '';
}
+sub body_tag_start {
+ my ($target,$background,$bgcolor)=@_;
+ my $body_tag_start='
'.&Apache::lonmenu::menubuttons(undef,$target,1);
+
+ &Apache::lontexconvert::jsMath_reset();
+ if ($env{'environment.texengine'} eq 'jsMath') {
+ $body_tag_start.=&Apache::lontexconvert::jsMath_header();
+ }
+ return $body_tag_start;
+}
+
sub page_start {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my %found;
@@ -83,33 +110,25 @@ sub page_start {
$result=&Apache::londefdef::start_html($target,$token,$tagstack,
$parstack,$parser,$safeeval);
$head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target).
- &Apache::lonhtmlcommon::htmlareaheaders();
+ &Apache::lonhtmlcommon::htmlareaheaders().
+ &Apache::lonhtmlcommon::spellheader().
+ &Apache::lonxml::fontsettings();
}
my $body_tag_start;
- if (!defined($found{'body'})) {
- $body_tag_start=''.&Apache::lonmenu::menubuttons(undef,$target,1);
- if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
+ my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
+ $safeeval);
+ $body_tag_start=&body_tag_start($target,$background,$bgcolor);
+ if ( ($target eq 'web' || $target eq 'webgrade')
+ && $env{'request.state'} ne 'construct') {
my ($symb,undef,undef,undef,$publicuser)=
&Apache::lonxml::whichuser();
if ($symb eq '' && !$publicuser) {
@@ -122,8 +141,10 @@ sub page_start {
}
my $form_tag_start;
if (!defined($found{'form'})) {
- $form_tag_start='\n\n";
+ "\n\n".&Apache::loncommon::endbodytag()."\n";
}
sub option {
my ($value,$name) = @_;
my $result ="
".&option('CAN_ANSWER' ,'problemstate').&mt("Answerable")."
".&option('CANNOT_ANSWER_tries' ,'problemstate').&mt("Open with full tries")."
@@ -246,7 +282,7 @@ Problem Status:
Problem Type:
";
- my $numtoanalyze=$ENV{'form.numtoanalyze'};
- if (!$numtoanalyze) { $numtoanalyze=20; }
- $result.= ' for
+ my $numtoanalyze=$env{'form.numtoanalyze'};
+ if (!$numtoanalyze) { $numtoanalyze=20; }
+ $result.= ' for
'.&mt('versions of this problem').
'.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
'',undef,undef,300).
'';
+ }
return $result;
}
@@ -278,9 +315,9 @@ sub initialize_storage {
%Apache::lonhomework::results=();
%Apache::lonhomework::history=();
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
+ if ($env{'request.state'} eq 'construct' || $symb eq '') {
%Apache::lonhomework::history=
- &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
+ &Apache::lonnet::tmprestore($env{'request.uri'},'',$domain,$name);
my ($temp)=keys %Apache::lonhomework::history ;
&Apache::lonxml::debug("Return message of $temp");
} else {
@@ -296,24 +333,69 @@ sub initialize_storage {
# Stores away the result has to a student's environment
# checks form.grade_ for specific values, other wises stores
# to the running users environment
+# Will increment totals for attempts, students, and corrects
+# if running user has student role.
sub finalize_storage {
my $result;
- my ($temp) = keys %Apache::lonhomework::results;
- if ( $temp ne '' ) {
+ if (%Apache::lonhomework::results) {
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
- $Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'};
+ if ($env{'request.state'} eq 'construct' || $symb eq '') {
+ $Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'};
$result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
- $ENV{'request.uri'},'',$domain,$name);
+ $env{'request.uri'},'',$domain,$name);
&Apache::lonxml::debug('Construct Store return message:'.$result);
} else {
$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
$symb,$courseid,$domain,$name);
&Apache::lonxml::debug('Store return message:'.$result);
+ if ($env{'request.role'} =~/^st/) {
+ &store_aggregates($symb,$courseid);
+ }
}
}
return $result;
}
+use Data::Dumper;
+
+# -------------------------------------------------------------store_aggregates
+# Sends hash of values to be incremented in nohist_resourcetracker.db
+# for the course. Increments total number of attempts, unique students
+# and corrects for each part for an instance of a problem, as appropriate.
+sub store_aggregates {
+ my ($symb,$courseid) = @_;
+ my %aggregate;
+ my @parts;
+ my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
+ foreach my $key (keys(%Apache::lonhomework::results)) {
+ if ($key =~ /resource\.([^\.]+)\.tries/) {
+ push(@parts, $1);
+ }
+ }
+ foreach my $part (@parts) {
+ if ($Apache::lonhomework::results{'resource.'.$part.'.award'}
+ eq 'APPROX_ANS' ||
+ $Apache::lonhomework::results{'resource.'.$part.'.award'}
+ eq 'EXACT_ANS') {
+ $aggregate{$symb."\0".$part."\0correct"} = 1;
+ }
+ if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
+ $aggregate{$symb."\0".$part."\0users"} = 1;
+ } else {
+ my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]);
+ if ($last_reset) {
+ if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {
+ $aggregate{$symb."\0".$part."\0users"} = 1;
+ }
+ }
+ }
+ $aggregate{$symb."\0".$part."\0attempts"} = 1;
+ }
+ if (keys (%aggregate) > 0) {
+ &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+ $cdomain,$cname);
+ }
+}
sub checkout_msg {
my %lt=&Apache::lonlocal::texthash(
@@ -328,7 +410,7 @@ sub checkout_msg {
$lt{'warning'}
-
@@ -342,7 +424,7 @@ sub firstaccess_msg {
&Apache::lonxml::debug("map is $map title is $foldertitle");
return (<The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".
-
@@ -352,15 +434,26 @@ ENDCHECKOUT
sub init_problem_globals {
my ($type)=@_;
#initialize globals
+ # For problems, we start out in part 0 (outside a tag).
+ # and part 0 is used to describe the main body of the
+ #
if ($type eq 'problem') {
$Apache::inputtags::part='0';
@Apache::inputtags::partlist=('0');
+ $Apache::lonhomework::problemstatus=&get_problem_status('0');
+ $Apache::lonhomework::ignore_response_errors=0;
- $Apache::lonhomework::problemstatus=&get_problem_status('0')
- } else {
+ } elsif ($type eq 'library') {
$Apache::inputtags::part='';
@Apache::inputtags::partlist=();
$Apache::lonhomework::problemstatus='';
+ $Apache::lonhomework::ignore_response_errors=1;
+
+ } elsif ($type eq 'Task') {
+ $Apache::inputtags::part='0';
+ @Apache::inputtags::partlist=('0');
+ $Apache::lonhomework::problemstatus='';
+ $Apache::lonhomework::ignore_response_errors=1;
}
@Apache::inputtags::responselist = ();
@Apache::inputtags::importlist = ();
@@ -388,7 +481,7 @@ sub reset_problem_globals {
sub set_problem_state {
my ($part)=@_;
- if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
+ if ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
$Apache::lonhomework::history{"resource.$part.solved"}=
'correct_by_student';
}
@@ -396,12 +489,14 @@ sub set_problem_state {
sub get_problem_status {
my ($part)=@_;
- my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
- &Apache::lonxml::debug("problem status for $part is $problem_status");
- &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
- if ($ENV{'request.state'} eq 'construct' &&
- defined($ENV{'form.problemstatus'})) {
- $problem_status=$ENV{'form.problemstatus'};
+ my $problem_status;
+ if ($env{'request.state'} eq 'construct' &&
+ defined($env{'form.problemstatus'})) {
+ $problem_status=$env{'form.problemstatus'};
+ } else {
+ $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+ &Apache::lonxml::debug("problem status for $part is $problem_status");
+ &Apache::lonxml::debug("env probstat is ".$env{'form.problemstatus'});
}
return $problem_status;
}
@@ -409,6 +504,12 @@ sub get_problem_status {
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ # We'll use the redirection to fix up printing of duedates.
+ &Apache::lonxml::startredirection();
+
+ # Problems don't nest and we don't allow more than one in
+ # a .problem file.
+ #
if ( $Apache::inputtags::part ne '' ||
$Apache::lonhomework::parsing_a_problem) {
&Apache::lonxml::error('Only one <problem> allowed in a .problem file');
@@ -419,7 +520,7 @@ sub start_problem {
$Apache::lonhomework::parsing_a_problem=1;
&init_problem_globals('problem');
- if (defined($ENV{'scantron.maxquest'})) {
+ if (defined($env{'scantron.maxquest'})) {
$Apache::lonhomework::scantronmode=1;
}
@@ -428,16 +529,16 @@ sub start_problem {
if ($target eq 'web') {
&Apache::lonhomework::showhash(%Apache::lonhomework::history);
}
- if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); }
+ if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); }
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
- if (($ENV{'request.state'} eq 'construct') &&
- defined($ENV{'form.problemtype'})) {
- $Apache::lonhomework::type=$ENV{'form.problemtype'};
+ if (($env{'request.state'} eq 'construct') &&
+ defined($env{'form.problemtype'})) {
+ $Apache::lonhomework::type=$env{'form.problemtype'};
}
&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
}
if ($Apache::lonhomework::type eq '' ) {
- my $uri=$ENV{'request.uri'};
+ my $uri=$env{'request.uri'};
if ($uri=~/\.(\w+)$/) {
$Apache::lonhomework::type=$1;
&Apache::lonxml::debug("Using type of $1");
@@ -446,6 +547,7 @@ sub start_problem {
&Apache::lonxml::debug("Using default type, problem, :$uri:");
}
}
+ $Apache::lonhomework::default_type = $Apache::lonhomework::type;
#added vars to the scripting enviroment
my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
@@ -457,7 +559,7 @@ sub start_problem {
#should get back a or the neccesary stuff to start XML/MathML
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
- if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) {$result='';}
+ if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
@@ -466,26 +568,36 @@ sub start_problem {
if ($Apache::lonhomework::type eq 'exam') {
my $token=
$Apache::lonhomework::history{"resource.0.outtoken"};
- if (($ENV{'form.doescheckout'}) && (!$token)) {
+ if (($env{'form.doescheckout'}) && (!$token)) {
$token=&Apache::lonxml::maketoken();
$Apache::lonhomework::history{"resource.0.outtoken"}=
$token;
}
$body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
}
- if ($ENV{'form.markaccess'}) {
+ if ($env{'form.markaccess'}) {
&Apache::lonnet::set_first_access('map');
}
#handle rand seed in construction space
my $rndseed=&setup_rndseed($safeeval);
my ($symb)=&Apache::lonxml::whichuser();
- if ($ENV{'request.state'} ne "construct" && $symb eq '') {
+ if ($env{'request.state'} ne "construct" && $symb eq '') {
$form_tag_start.=''.
''.
' ';
+ value="'.$env{'form.username'}.'" />';
+ if ($env{'user.adv'}) {
+ $form_tag_start.=
+ ' ';
+ }
+ $form_tag_start.='';
}
($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);
@@ -530,24 +642,24 @@ sub start_problem {
$body_tag_start \n $form_tag_start".
'';
# create a page header and exit
- if ($ENV{'request.state'} eq "construct") {
- $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
+ if ($env{'request.state'} eq "construct") {
+ $result.= &problem_web_to_edit_header($env{'form.rndseed'});
}
# if we are viewing someone else preserve that info
- if (defined $ENV{'form.grade_symb'}) {
+ if (defined $env{'form.grade_symb'}) {
foreach my $field ('symb','courseid','domain','username') {
$result .= ''."\n";
+ '" value="'.$env{"form.grade_$field"}.'" />'."\n";
}
}
} elsif ($target eq 'tex') {
my $startminipage = '';
- if (not $ENV{'form.problem_split'}=~/yes/) {
+ if (not $env{'form.problem_split'}=~/yes/) {
$startminipage = '\begin{minipage}{\textwidth}';
}
my $id = $Apache::inputtags::part;
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
- my $packages=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+ my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
my @packages = split /,/,$packages;
my $allow_print_points = 0;
foreach my $partial_key (@packages) {
@@ -555,35 +667,55 @@ sub start_problem {
$allow_print_points=1;
}
}
- my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");
- $duedate = POSIX::strftime("%c",localtime($duedate));
+ my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+ if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
+ if (lc($env{'course.'.$env{'request.course.id'}.
+ '.disableexampointprint'}) eq 'yes') {
+ $allow_print_points=0;
+ }
+ my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
+ my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$env{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent ';
+ my $toc_line='\vskip 1 mm\noindent '.$startminipage.
+ '\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+
+ # Figure out what the due date is and if we need to print
+ # it in the problem header. We have been logging the
+ # last due date written to file.
+
+ my $duetime = &Apache::lonnet::EXT("resource.$id.duedate");
+ my $duedate = POSIX::strftime("%c",localtime($duetime));
my $temp_file;
- my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+ my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
+
+ # Figure out what the last printed due date is or set it
+ # to the epoch if no duedates have been printed.
+
+ my $due_file_content = 0; # If the file does not yet exist, time is the epoch.
if (-e $filename) {
$temp_file = Apache::File->new($filename);
- } else {
- $temp_file = Apache::File->new('>>'.$filename);
- }
- my @due_file_content = <$temp_file>;
- my $due_file_content = $due_file_content[$#due_file_content];
- chomp $due_file_content;
- my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
- if ($due_file_content ne $duedate) {
+ my @due_file = <$temp_file>;
+ $due_file_content = $due_file[$#due_file];
+ chomp $due_file_content;
+ }
+
+ # comparisons of the absolute times
+ if ($due_file_content != $duetime) {
$temp_file = Apache::File->new('>'.$filename);
- print $temp_file "$duedate\n";
- if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ print $temp_file "$duetime\n";
+ if (not $env{'request.symb'} =~ m/\.page_/) {
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource