--- loncom/homework/structuretags.pm 2001/10/30 19:18:15 1.71 +++ loncom/homework/structuretags.pm 2002/04/11 17:37:13 1.90 @@ -1,5 +1,30 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document +# +# $Id: structuretags.pm,v 1.90 2002/04/11 17:37:13 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # 2/19 Guy # 6/26/2001 fixed extra web display at end of tags # 8/17,8/18,8/20 Gerd Kortemeyer @@ -9,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')) } @@ -42,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='
'; + $rndseed.'" /> + + +
'; } # if we are viewing someone else preserve that info if (defined $ENV{'form.grade_symb'}) { @@ -233,6 +289,7 @@ sub start_problem { +

'; @@ -241,6 +298,8 @@ sub start_problem { } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); + } elsif ($target eq 'tex') { + $result .= '\begin{document} '; } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -253,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') { @@ -284,6 +342,8 @@ sub end_problem { } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); $result='
'; + } elsif ($target eq 'tex') { + $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}'; } return $result; } @@ -379,6 +439,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); @@ -403,16 +464,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 { @@ -429,7 +501,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 { @@ -549,17 +626,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 {