--- loncom/homework/structuretags.pm 2003/04/03 14:31:58 1.159
+++ loncom/homework/structuretags.pm 2003/08/30 02:33:25 1.207
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.159 2003/04/03 14:31:58 albertel Exp $
+# $Id: structuretags.pm,v 1.207 2003/08/30 02:33:25 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,7 +38,8 @@ use Apache::File();
use Apache::lonmenu;
BEGIN {
- &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
+ &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
+'simpleeditbutton','definetag'));
}
sub start_web {
@@ -56,11 +57,12 @@ sub end_web {
sub start_tex {
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 '';
+ return $result;;
}
sub end_tex {
@@ -70,7 +72,7 @@ sub end_tex {
sub page_start {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my %found;
- foreach my $taginside ($tagstack) {
+ foreach my $taginside (@$tagstack) {
foreach my $taglookedfor ('html','body','form') {
if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;}
}
@@ -89,6 +91,7 @@ sub page_start {
'onUnload="'.&Apache::lonmenu::unloadevents().'" ';
my $background=&Apache::lonxml::get_param('background',$parstack,
$safeeval);
+ if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; }
if ($background) {
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$background;
@@ -96,18 +99,22 @@ sub page_start {
} else {
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
$safeeval);
- if ($bgcolor) {
+ 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);
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
- my ($symb)=&Apache::lonxml::whichuser();
- if ($symb eq '') {
+ my ($symb,undef,undef,undef,$publicuser)=
+ &Apache::lonxml::whichuser();
+ if ($symb eq '' && !$publicuser) {
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
- $help="Browsing or ambiguous reference, submissions ignored $help ";
+ $help="Browsing resource, all submissions are temporary. ";
$body_tag_start.=$help;
}
}
@@ -123,11 +130,18 @@ sub page_start {
#use Time::HiRes();
sub get_resource_name {
my ($parstack,$safeeval)=@_;
+ if (defined($Apache::lonhomework::name)) {
+ return $Apache::lonhomework::name;
+ }
my $name=&Apache::lonnet::gettitle();
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
if ($name eq 'con_lost') { $name = ''; }
}
+ if ($name!~/\S+/) {
+ $name=$ENV{'request.uri'};
+ $name=~s-.*/([^/]+)$-$1-;
+ }
$Apache::lonhomework::name=$name;
return $name;
}
@@ -135,12 +149,27 @@ sub get_resource_name {
sub setup_rndseed {
my ($safeeval)=@_;
my $rndseed;
- if ($ENV{'request.state'} eq "construct") {
+ my ($symb)=&Apache::lonxml::whichuser();
+ if ($ENV{'request.state'} eq "construct" || $symb eq '') {
$rndseed=$ENV{'form.rndseed'};
if (!$rndseed) {
- $rndseed=time;
+ $rndseed=$Apache::lonhomework::history{'rndseed'};
+ if (!$rndseed) {
+ $rndseed=time;
+ $ENV{'form.rndseed'}=$rndseed;
+ }
+ }
+ if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
+ $ENV{'form.newrandomization'} eq 'New Randomization') {
+ srand(time);
+ $rndseed=int(rand(2100000000));
$ENV{'form.rndseed'}=$rndseed;
+ delete($ENV{'form.resetdata'});
+ delete($ENV{'form.newrandomization'});
}
+ if (defined($rndseed) && $rndseed ne int($rndseed)) {
+ $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
+ }
&Apache::lonxml::debug("Setting rndseed to $rndseed");
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
}
@@ -168,26 +197,32 @@ sub problem_web_to_edit_header {
my $result.='
- Random Seed:
-
+
+
+
Show All Foils
';
my $numtoanalyze=$ENV{'form.numtoanalyze'};
- if (!$numtoanalyze) { $numtoanalyze=100; }
- $result.= '
+ if (!$numtoanalyze) { $numtoanalyze=20; }
+ $result.= ' for
';
+ $numtoanalyze.'" size="5" /> versions of this problem.'.
+ &Apache::loncommon::help_open_topic("Analyze_Problem",
+ '',undef,undef,300).
+ '';
return $result;
}
sub initialize_storage {
%Apache::lonhomework::results=();
+ %Apache::lonhomework::history=();
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- if ($ENV{'request.state'} eq 'construct') {
+ 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 ;
@@ -210,7 +245,8 @@ sub finalize_storage {
my ($temp) = keys %Apache::lonhomework::results;
if ( $temp ne '' ) {
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- if ($ENV{'request.state'} eq 'construct') {
+ 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);
@@ -239,24 +275,58 @@ credit even if done erroneously.
ENDCHECKOUT
}
-sub start_problem {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-
- $Apache::lonhomework::parsing_a_problem=1;
- # 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);
- return '';
+sub init_problem_globals {
+ my ($type)=@_;
+ #initialize globals
+ if ($type eq 'problem') {
+ $Apache::inputtags::part='0';
+ @Apache::inputtags::partlist=('0');
+ $Apache::lonhomework::problemstatus=
+ &Apache::lonnet::EXT('resource.0.problemstatus');
+ } else {
+ $Apache::inputtags::part='';
+ @Apache::inputtags::partlist=();
+ $Apache::lonhomework::problemstatus='';
}
-#intialize globals
- $Apache::inputtags::part='0';
@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);
+ undef($Apache::lonhomework::parsing_a_problem);
+ undef($Apache::lonhomework::name);
+}
+
+sub start_problem {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+
+ 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 '';
+ }
+
+ $Apache::lonhomework::parsing_a_problem=1;
+ &init_problem_globals('problem');
+
+ if (defined($ENV{'scantron.maxquest'})) {
+ $Apache::lonhomework::scantronmode=1;
+ }
+
if ($target ne 'analyze') {
&initialize_storage();
if ($target eq 'web') {
@@ -265,7 +335,7 @@ sub start_problem {
$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 '') {
+ if ($Apache::lonhomework::type eq '' ) {
my $uri=$ENV{'request.uri'};
if ($uri=~/\.(\w+)$/) {
$Apache::lonhomework::type=$1;
@@ -304,6 +374,15 @@ sub start_problem {
#handle rand seed in construction space
my $rndseed=&setup_rndseed($safeeval);
+ my ($symb)=&Apache::lonxml::whichuser();
+ if ($ENV{'request.state'} ne "construct" && $symb eq '') {
+ $form_tag_start.=''.
+ ''.
+ ' ';
+ }
($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';
@@ -345,7 +424,7 @@ sub start_problem {
$body_tag_start \n $form_tag_start".
'';
if ($ENV{'request.state'} eq "construct") {
- $result.= &problem_web_to_edit_header($rndseed);
+ $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
}
# if we are viewing someone else preserve that info
if (defined $ENV{'form.grade_symb'}) {
@@ -360,12 +439,10 @@ sub start_problem {
"$name\n$body_tag_start\n";
}
} elsif ($target eq 'tex') {
- my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
- if ($name eq '') {
- $name=&Apache::lonnet::EXT('resource.title');
- if ($name eq 'con_lost') { $name = ''; }
+ my $startminipage = '';
+ if (not $ENV{'form.problem_split'}=~/yes/) {
+ $startminipage = '\begin{minipage}{\textwidth}';
}
- $Apache::lonhomework::name=$name;
my $id = $Apache::inputtags::part;
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys');
@@ -394,9 +471,9 @@ sub start_problem {
print $temp_file "$duedate\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
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
} else {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
} else {
@@ -404,7 +481,7 @@ sub start_problem {
}
} else {
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';
+ $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource
"'.$name_of_resourse.'"
located in '.$ENV{'request.uri'}.' STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} else {
$result .= '\vskip 1mm \\\\\\\\';
@@ -449,21 +526,27 @@ sub end_problem {
($target eq 'answer') || ($target eq 'tex')
) {
if ($status eq 'CAN_ANSWER') {
- if ($target ne 'tex') {
+ if ($target ne 'tex' &&
+ $ENV{'form.answer_output_mode'} ne 'tex') {
$result.="