--- loncom/homework/structuretags.pm 2003/05/03 20:35:43 1.167
+++ loncom/homework/structuretags.pm 2003/07/17 18:42:13 1.198
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.167 2003/05/03 20:35:43 www Exp $
+# $Id: structuretags.pm,v 1.198 2003/07/17 18:42:13 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,14 +38,15 @@ use Apache::File();
use Apache::lonmenu;
BEGIN {
- &Apache::lonxml::register('Apache::structuretags',('block','languageblock','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 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
- if ($target eq 'web') {
- return $bodytext;
+ if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' ||
+ $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
}
return '';
}
@@ -56,11 +57,15 @@ sub end_web {
sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
- if ($target eq 'tex') {
- return $bodytext.' ';
+ my $result='';
+ if (!($target eq 'edit' || $target eq 'modified' ||
+ $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+ &Apache::lonxml::debug("tex 1");
+ my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+ } elsif ($target eq 'tex') {
+ $result=&Apache::lonxml::get_all_text("/tex",$parser);
}
- return '';
+ return $result;;
}
sub end_tex {
@@ -146,10 +151,17 @@ sub setup_rndseed {
$ENV{'form.rndseed'}=$rndseed;
}
}
- if ($ENV{'form.resetdata'} eq 'New Problem Variation') {
- $rndseed=time;
+ 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);
}
@@ -177,19 +189,24 @@ 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;
}
@@ -253,18 +270,19 @@ 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);
+ 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;
#initialize globals
$Apache::inputtags::part='0';
+ @Apache::inputtags::partlist=('0');
@Apache::inputtags::responselist = ();
+ @Apache::inputtags::importlist = ();
@Apache::inputtags::previous=();
@Apache::inputtags::previous_version=();
$Apache::structuretags::printanswer='No';
@@ -272,6 +290,8 @@ sub start_problem {
@Apache::structuretags::whilebody=();
@Apache::structuretags::whileline=();
$Apache::lonhomework::scantronmode=0;
+ $Apache::lonhomework::problemstatus=
+ &Apache::lonnet::EXT('resource.0.problemstatus');
if (defined($ENV{'scantron.maxquest'})) {
$Apache::lonhomework::scantronmode=1;
@@ -331,7 +351,7 @@ sub start_problem {
''.
'';
+ value="'.$ENV{'form.username'}.'" /> ';
}
($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);
@@ -374,7 +394,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'}) {
@@ -389,6 +409,10 @@ sub start_problem {
"$name\n$body_tag_start\n";
}
} elsif ($target eq 'tex') {
+ my $startminipage = '';
+ if (not $ENV{'form.problem_split'}=~/yes/) {
+ $startminipage = '\begin{minipage}{\textwidth}';
+ }
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
@@ -423,9 +447,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;
} 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;
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
}
} else {
@@ -433,7 +457,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;
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} else {
$result .= '\vskip 1mm \\\\\\\\';
@@ -478,21 +502,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.="