--- loncom/homework/structuretags.pm 2002/09/16 20:40:38 1.114
+++ loncom/homework/structuretags.pm 2002/11/07 16:10:47 1.133
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.114 2002/09/16 20:40:38 albertel Exp $
+# $Id: structuretags.pm,v 1.133 2002/11/07 16:10:47 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,7 @@
# 6/26/2001 fixed extra web display at end of
'; } @@ -161,8 +162,15 @@ sub problem_web_to_edit_header { Show All Foils + $result.= ' /> Show All Foils
]*)>//g;
- $string =~ s/<\/td>//g;
- $string =~ s//\\textbf{/g;
- $string =~ s/<\/b>/}/g;
- $string =~ s/ /\\vskip 0 mm /g; - $string =~ s/]*)>//g; - return $string; -} sub start_library { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -489,21 +483,37 @@ sub end_library { } sub start_block { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { - my $code = @$parstack[$#$parstack]; - $code =~ s/\"//g; - $code .=';return $condition;'; - # print " $code "; - my $result = &Apache::run::run($code,$safeeval); - &Apache::lonxml::debug("block :$code: returned :$result:"); - if ( ! $result ) { - my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]); - &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]"); + my $result; + + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + my $code = @$parstack[$#$parstack]; + if ($code) { + $code =~ s/\"//g; + $code .=';return $condition;'; + $result = &Apache::run::run($code,$safeeval); + &Apache::lonxml::debug("block :$code: returned :$result:"); + } else { + $result='1'; + } + if ( ! $result ) { + my $skip=&Apache::lonxml::get_all_text("/block",$$parser[-1]); + &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); + } + $result=''; + } elsif ($target eq 'edit') { + $result .=&Apache::edit::tag_start($target,$token); + $result .=&Apache::edit::text_arg('Test Condition:','condition', + $token,40); + $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'condition'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } - } - return ""; + return $result; } sub end_block { @@ -548,7 +558,7 @@ sub start_randomlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || - $target eq 'tex') { + $target eq 'tex' || $target eq 'analyze') { my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); my $b_parser= HTML::TokeParser->new(\$body); my $b_tok; @@ -601,7 +611,7 @@ sub shuffle { if (defined(@$a)) { &Apache::response::setrandomnumber(); for($i=@$a;--$i;) { - my $j=int rand($i+1); + my $j=int(&Math::Random::random_uniform() * ($i+1)); next if $i == $j; @$a[$i,$j] = @$a[$j,$i]; } @@ -638,11 +648,13 @@ sub start_part { if ( $target eq "web" ) { $result=" Part is not open to be viewed. It $accessmsg "; } elsif ( $target eq 'tex' ) { - $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; + $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; } } else { if ($target eq 'tex') { - $result='\vskip 0 mm'; + if ($$tagstack[-2] ne 'problem') { + $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + } } } } @@ -659,9 +671,8 @@ sub end_part { return &Apache::inputtags::grade; } if ($target eq 'web' || $target eq 'tex' ) { - my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part); - #FIXME this is ugly we should just generate tex in inputtags - if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); } + my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target); + if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} return $gradestatus; } return ''; @@ -671,7 +682,8 @@ sub start_preduedate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && - $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { + $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' && + $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); } } @@ -750,7 +762,7 @@ sub end_startouttext { | ". &Apache::edit::insertlist($target,$token). &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". - &Apache::edit::editfield($token->[1],$text,"",50,4); + &Apache::edit::editfield($token->[1],$text,"",80,4); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); @@ -765,7 +777,9 @@ sub start_endouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; if ($target eq "edit" ) { $result=" |