--- loncom/homework/structuretags.pm 2002/07/24 20:34:52 1.102
+++ 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.102 2002/07/24 20:34:52 sakharuk Exp $
+# $Id: structuretags.pm,v 1.315 2005/11/04 15:34:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,28 +25,29 @@
#
# http://www.lon-capa.org/
#
-# 2/19 Guy
-# 6/26/2001 fixed extra web display at end of tags
-# 8/17,8/18,8/20 Gerd Kortemeyer
+###
+
package Apache::structuretags;
use strict;
use Apache::lonnet;
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','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
-# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
+ &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
}
sub start_web {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
- if ($target eq 'web') {
- return $bodytext;
- }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+ if ($target eq 'web') {
+ return $bodytext;
+ }
+ return '';
}
sub end_web {
@@ -54,665 +55,1466 @@ sub end_web {
}
sub start_tex {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
- if ($target eq 'tex') {
- return $bodytext.' ';
- }
- return '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result='';
+ my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+ if ($target eq 'tex') {
+ return $bodytext.' ';
+ }
+ return $result;;
}
sub end_tex {
return '';
}
-sub page_start {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my %found;
- foreach my $taginside ($tagstack) {
- foreach my $taglookedfor ('html','body','form') {
- if ($taginside =~ /^$taglookedfor$/i) { $found{$taglookedfor} = 1; }
- }
- }
-
- my $result;
- my $head_tag_start;
- if (!defined($found{'html'})) {
- $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,
- $parser,$safeeval);
- $head_tag_start='
'.&Apache::lonxml::registerurl(undef,$target);
- }
- my $body_tag_start;
- if (!defined($found{'body'})) {
- $body_tag_start='';
- }
- return ($result,$head_tag_start,$body_tag_start);
+ if (($bgcolor) && ($env{'browser.blackwhite'} ne 'on')) {
+ $body_tag_start.='bgcolor="'.$bgcolor.'" ';
+ } else {
+ $body_tag_start.='bgcolor="#ffffff"';
+ }
+ }
+ if ($env{'browser.fontenhance'} eq 'on') {
+ $body_tag_start.=' style="font-size: x-large;" ';
+ }
+ $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;
+ foreach my $taginside (@$tagstack) {
+ foreach my $taglookedfor ('html','body','form') {
+ if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;}
+ }
+ }
+
+ my $result;
+ my $head_tag_start;
+ if (!defined($found{'html'})) {
+ $result=&Apache::londefdef::start_html($target,$token,$tagstack,
+ $parstack,$parser,$safeeval);
+ $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target).
+ &Apache::lonhtmlcommon::htmlareaheaders().
+ &Apache::lonhtmlcommon::spellheader().
+ &Apache::lonxml::fontsettings();
+ }
+ my $body_tag_start;
+ if (!defined($found{'body'}) && $env{'request.state'} eq 'construct'
+ && $env{'environment.remote'} eq 'off') {
+ if ($target eq 'web' || $target eq 'edit') {
+ $body_tag_start=&Apache::loncommon::bodytag();
+ $body_tag_start.=&Apache::lonxml::message_location();
+ }
+ } elsif (!defined($found{'body'})) {
+ my $background=&Apache::lonxml::get_param('background',$parstack,
+ $safeeval);
+ 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) {
+ my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
+ $help=&mt("Browsing resource, all submissions are temporary.")." ";
+ $body_tag_start.=$help;
+ }
+ }
+ $body_tag_start.=&Apache::lonxml::message_location();
+ }
+ my $form_tag_start;
+ if (!defined($found{'form'})) {
+ $form_tag_start='\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")."
+ ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."
+ ".&option('SHOW_ANSWER' ,'problemstate').&mt("Show Answer")."
+
+
+
+Problem Type:
+
+
+
+Feedback Mode:
+
+
+
+";
+ 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;
}
sub initialize_storage {
- %Apache::lonhomework::results=();
- my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- if ($ENV{'request.state'} eq 'construct') {
- %Apache::lonhomework::history=
- &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
+ %Apache::lonhomework::results=();
+ %Apache::lonhomework::history=();
+ my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ if ($env{'request.state'} eq 'construct' || $symb eq '') {
+ %Apache::lonhomework::history=
+ &Apache::lonnet::tmprestore($env{'request.uri'},'',$domain,$name);
+ my ($temp)=keys %Apache::lonhomework::history ;
+ &Apache::lonxml::debug("Return message of $temp");
+ } else {
+ %Apache::lonhomework::history=
+ &Apache::lonnet::restore($symb,$courseid,$domain,$name);
+ }
+ #ignore error conditions
my ($temp)=keys %Apache::lonhomework::history ;
- &Apache::lonxml::debug("Return message of $temp");
- } else {
- %Apache::lonhomework::history=
- &Apache::lonnet::restore($symb,$courseid,$domain,$name);
- }
- #ignore error conditions
- my ($temp)=keys %Apache::lonhomework::history ;
- if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
+ if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
}
# -------------------------------------------------------------finalize_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 '' ) {
- my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- if ($ENV{'request.state'} eq 'construct') {
- $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
- $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);
+ my $result;
+ 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'};
+ $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
+ $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);
}
- }
- return $result;
}
sub checkout_msg {
-return (<The resource needs to be checked out
-As a resource gets checked out, a unique timestamped ID is given to it, and a
-permanent record is left in the system.
-
-Checking out resources is subject to course policies, and may exclude future
-credit even if done erroneously.
+ my %lt=&Apache::lonlocal::texthash(
+ 'resource'=>'The resource needs to be checked out',
+ 'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.',
+ 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
+ 'checkout'=>'Check out Exam for Viewing',
+ 'checkout?'=>'Check out Exam?');
+ return (<$lt{'resource'}
+
$lt{'id_expln'}
+
+
$lt{'warning'}
-
ENDCHECKOUT
}
-sub start_problem {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+sub firstaccess_msg {
+ my ($time,$symb)=@_;
+ my ($map)=&Apache::lonnet::decode_symb($symb);
+ my $foldertitle=&Apache::lonnet::gettitle($map);
+ &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".
+
+ENDCHECKOUT
+}
- # meta is called from lonpublisher, which doesn't uses the normal
- # lonhomework method of parsing the file which means that inputtags
- # won't get reset
- if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
- &Apache::lonxml::error('Only one problem allowed in a .problem file');
- my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]);
- return '';
- }
-#intialize globals
- $Apache::inputtags::part='0';
- @Apache::inputtags::responselist = ();
- @Apache::inputtags::previous=();
- if ($target ne 'analyze') {
- &initialize_storage();
- if ($target eq 'web') {
- &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+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;
+
+ } 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 = ();
+ @Apache::inputtags::previous=();
+ @Apache::inputtags::previous_version=();
+ $Apache::structuretags::printanswer='No';
+ @Apache::structuretags::whileconds=();
+ @Apache::structuretags::whilebody=();
+ @Apache::structuretags::whileline=();
+ $Apache::lonhomework::scantronmode=0;
+ undef($Apache::lonhomework::name);
+
+}
+
+sub reset_problem_globals {
+ my ($type)=@_;
+ undef(%Apache::lonhomework::history);
+ undef(%Apache::lonhomework::results);
+ undef($Apache::inputtags::part);
+#don't undef this, lonhomework.pm takes care of this, we use this to
+#detect if we try to do 2 problems in one file
+# undef($Apache::lonhomework::parsing_a_problem);
+ undef($Apache::lonhomework::name);
+}
+
+sub set_problem_state {
+ my ($part)=@_;
+ if ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
+ $Apache::lonhomework::history{"resource.$part.solved"}=
+ 'correct_by_student';
}
- $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
- &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
- }
- if ($Apache::lonhomework::type eq '') {
- my $uri=$ENV{'request.uri'};
- if ($uri=~/\.(\w+)$/) {
- $Apache::lonhomework::type=$1;
- &Apache::lonxml::debug("Using type of $1");
+}
+
+sub get_problem_status {
+ my ($part)=@_;
+ my $problem_status;
+ if ($env{'request.state'} eq 'construct' &&
+ defined($env{'form.problemstatus'})) {
+ $problem_status=$env{'form.problemstatus'};
} else {
- $Apache::lonhomework::type='problem';
- &Apache::lonxml::debug("Using default type, problem, :$uri:");
+ $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;
+}
+
+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');
+ #my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
+ return '';
}
- }
- #added vars to the scripting enviroment
- my $expression='$external::part='.$Apache::inputtags::part.';';
- &Apache::run::run($expression,$safeeval);
- my $status;
- my $accessmsg;
-
- #should get back a or the neccesary stuff to start XML/MathML
- my ($result,$head_tag_start,$body_tag_start)=
- &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
- if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
-
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
- #handle exam checkout
- if ($Apache::lonhomework::type eq 'exam') {
- my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
- if (($ENV{'form.doescheckout'}) && (!$token)) {
- $token=&Apache::lonxml::maketoken();
- $Apache::lonhomework::history{"resource.0.outtoken"}=$token;
- }
- $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
+ $Apache::lonhomework::parsing_a_problem=1;
+ &init_problem_globals('problem');
+
+ if (defined($env{'scantron.maxquest'})) {
+ $Apache::lonhomework::scantronmode=1;
}
- #handle rand seed in construction space
- my $rndseed;
- if ($ENV{'request.state'} eq "construct") {
- $rndseed=$ENV{'form.rndseed'};
- if (!$rndseed) {
- $rndseed=time;
- $ENV{'form.rndseed'}=$rndseed;
- }
- &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
- }
- ($status,$accessmsg) = &Apache::lonhomework::check_access('0');
- push (@Apache::inputtags::status,$status);
- my $expression='$external::datestatus="'.$status.'";';
- $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
- &Apache::run::run($expression,$safeeval);
- if (( $status eq 'CLOSED' ) ||
- ( $status eq 'UNCHECKEDOUT') ||
- ( $status eq 'BANNED')) {
- my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
- if ( $target eq "web" ) {
- $result.= $head_tag_start.'';
- my $msg=$body_tag_start.
- '
Not open to be viewed
';
- if ($status eq 'CLOSED') {
- $msg.='The problem '.$accessmsg;
- } elsif ($status eq 'UNCHECKEDOUT') {
- $msg.=&checkout_msg;
- }
- $result.=$msg.' ';
- }
- } elsif ($target eq 'web') {
- my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
- if ($name eq '') {
- $name=&Apache::lonnet::EXT('resource.title');
- if ($name eq 'con_lost') { $name = ''; }
- }
- $Apache::lonhomework::name=$name;
- if ($status eq 'CAN_ANSWER') {
- # create a page header and exit
- $result.="$head_tag_start$name\n
- $body_tag_start\n
-