--- loncom/homework/structuretags.pm 2002/04/11 17:37:13 1.90
+++ loncom/homework/structuretags.pm 2004/11/10 22:20:50 1.271
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.90 2002/04/11 17:37:13 albertel Exp $
+# $Id: structuretags.pm,v 1.271 2004/11/10 22:20:50 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,27 +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 {
@@ -53,12 +55,13 @@ 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 {
@@ -66,58 +69,237 @@ sub end_tex {
}
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);
+ 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'})) {
+ $body_tag_start=''.&Apache::lonmenu::menubuttons(undef,$target,1);
+ if ($target eq 'web' && $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\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
@@ -125,547 +307,1072 @@ sub initialize_storage {
# checks form.grade_ for specific values, other wises stores
# to the running users environment
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;
+ my ($temp) = keys %Apache::lonhomework::results;
+ if ( $temp ne '' ) {
+ 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);
+ }
}
- }
- return $result;
+ 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.
-
-