--- loncom/homework/structuretags.pm 2003/05/27 18:58:51 1.178
+++ loncom/homework/structuretags.pm 2003/06/20 14:45:19 1.188
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.178 2003/05/27 18:58:51 sakharuk Exp $
+# $Id: structuretags.pm,v 1.188 2003/06/20 14:45:19 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,9 +43,9 @@ BEGIN {
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,9 +56,10 @@ 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.' ';
+ if (!($target eq 'tex' || $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);
}
return '';
}
@@ -154,7 +155,12 @@ sub setup_rndseed {
$rndseed=int(rand(1000000000));
}
$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);
}
@@ -263,15 +269,14 @@ 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');
@@ -345,7 +350,7 @@ sub start_problem {
''.
'';
+ value="'.$ENV{'form.username'}.'" />
';
}
($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);
@@ -388,7 +393,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'}) {
@@ -532,6 +537,7 @@ sub end_problem {
}
} elsif ($target eq 'meta') {
if ($Apache::inputtags::part eq '0') {
+ @Apache::inputtags::response=();
$result=&Apache::response::mandatory_part_meta;
}
} elsif ($target eq 'edit') {
@@ -642,26 +648,7 @@ sub start_languageblock {
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- my $include = $token->[2]->{'include'};
- my $exclude = $token->[2]->{'exclude'};
- my %languages=&Apache::loncommon::display_languages();
- $result='1';
- if ($include) {
- $result='';
- foreach (split(/\,/,$include)) {
- if ($languages{$_}) { $result='1'; }
- }
- }
- if ($exclude) {
- foreach (split(/\,/,$exclude)) {
- if ($languages{$_}) { $result='0'; }
- }
- }
- if ( ! $result ) {
- my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser);
- &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
- }
- $result='';
+ &Apache::lonxml::startredirection();
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Include Language:','include',
@@ -681,7 +668,31 @@ sub start_languageblock {
sub end_languageblock {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- if ($target eq "edit") {
+
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ my $text=&Apache::lonxml::endredirection();
+ my $include= &Apache::lonxml::get_param('include',$parstack,$safeeval);
+ my $exclude= &Apache::lonxml::get_param('exclude',$parstack,$safeeval);
+ my %languages=&Apache::loncommon::display_languages();
+ $result='1';
+ if ($include) {
+ $result='';
+ foreach (split(/\,/,$include)) {
+ if ($languages{$_}) { $result='1'; }
+ }
+ }
+ if ($exclude) {
+ foreach (split(/\,/,$exclude)) {
+ if ($languages{$_}) { $result='0'; }
+ }
+ }
+ if ( ! $result ) {
+ $result='';
+ } else {
+ $result=$text;
+ }
+ } elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
}
return $result;
@@ -933,6 +944,8 @@ sub end_part {
$target);
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
$result=$gradestatus;
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::end_table();
}
pop @Apache::inputtags::status;
$Apache::inputtags::part='';
@@ -1027,15 +1040,7 @@ sub end_startouttext {
&Apache::edit::insertlist($target,$token).
&Apache::edit::end_row().
&Apache::edit::start_spanning_row()."\n"
- .'
'. - &Apache::loncommon::help_open_topic("Greek_Symbols", - 'Greek Symbols', - undef,undef,600) - .' | '. - &Apache::loncommon::help_open_topic("Other_Symbols", - 'Other Symbols', - undef,undef,600) - .' |