--- loncom/homework/structuretags.pm 2002/01/23 14:36:19 1.77 +++ loncom/homework/structuretags.pm 2002/04/10 19:58:19 1.89 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.77 2002/01/23 14:36:19 sakharuk Exp $ +# $Id: structuretags.pm,v 1.89 2002/04/10 19:58:19 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,7 +34,7 @@ package Apache::structuretags; use strict; use Apache::lonnet; -sub BEGIN { +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')) } @@ -67,24 +67,39 @@ sub end_tex { sub page_start { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); - my $head_tag_start=''.&Apache::lonxml::registerurl(); - my $body_tag_start='[4]; $result.=&Apache::edit::handle_insert(); } elsif ($target eq 'tex') { - $result .= '\begin{document}\noindent\textbf{Problem.}\newline'; + $result .= '\begin{document} '; } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -287,8 +312,7 @@ sub end_problem { my $result=''; my $status=$Apache::inputtags::status['-1']; if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) { - if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && - $status eq 'CAN_ANSWER') { + if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { # if part is zero, no s existed, so we need to the grading &Apache::inputtags::grade; } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') { @@ -314,12 +338,19 @@ sub end_problem { } elsif ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { $result=&Apache::response::mandatory_part_meta; + } else { + # there were intervening parts need to set the global temporarily + # and only need the package reference + my $temp=$Apache::inputtags::part; + $Apache::inputtags::part=0; + $result=&Apache::response::meta_package_write('part'); + $Apache::inputtags::part=$temp; } } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); $result='
'; } elsif ($target eq 'tex') { - $result .= '\end{document}'; + $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}'; } return $result; } @@ -415,6 +446,7 @@ sub end_while { # sub start_randomlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') { my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); my $b_parser= HTML::TokeParser->new(\$body); @@ -439,16 +471,27 @@ sub start_randomlist { # print "END-TAG $b_tok->[1]
"; # } } - my @idx_arr = (0 .. $#randomlist); &Apache::structuretags::shuffle(\@idx_arr); my $bodytext = ''; - for(0 .. $#randomlist) { + my $show=$#randomlist; + my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval); + $showarg--; + if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; } + for(0 .. $show) { $bodytext .= "$randomlist[ $idx_arr[$_] ]"; } &Apache::lonxml::newparser($parser,\$bodytext); + } elsif ($target eq 'edit' ) { + $result .= &Apache::edit::tag_start($target,$token); + $result .= &Apache::edit::text_arg('Maximum Tags to Show:','show',$token,5); + $result .= &Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified' ) { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'show'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } - return ""; + return $result; } sub shuffle { @@ -465,7 +508,12 @@ sub shuffle { } sub end_randomlist { - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + if ($target eq 'edit' ) { + $result=&Apache::edit::tag_end($target,$token,'End Randomly Parsed Block'); + } + return $result; } sub start_part { @@ -585,17 +633,19 @@ sub end_startouttext { $result.=&Apache::edit::start_table($token)."Text Block Delete:". &Apache::edit::deletelist($target,$token) - ." + ." ". &Apache::edit::insertlist($target,$token). - " -\n". - &Apache::edit::editfield($token->[1],$text,"",50,4); + &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". + &Apache::edit::editfield($token->[1],$text,"",50,4); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); $result=''.&Apache::edit::modifiedfield(); } + if ($target eq 'tex') { + $result .= '\noindent '; + } return $result; } sub start_endouttext {