--- loncom/homework/structuretags.pm 2001/06/05 16:32:18 1.41 +++ loncom/homework/structuretags.pm 2002/04/25 21:38:09 1.92 @@ -1,13 +1,41 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document +# +# $Id: structuretags.pm,v 1.92 2002/04/25 21:38:09 sakharuk 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 + package Apache::structuretags; use strict; use Apache::lonnet; -sub BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); +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')) } @@ -21,6 +49,7 @@ sub start_web { } sub end_web { + return ''; } sub start_tex { @@ -33,114 +62,321 @@ sub start_tex { } sub end_tex { + return ''; +} + +sub page_start { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my %found; + foreach my $taginside ($tagstack) { + foreach my $taglookedfor ('html','body','form') { + if ($taginside =~ /^$taglookedfor$/i) { $found{$taglookedfor} = 1; } + } + } + + my $result; + my $head_tag_start; + if (!defined($found{'html'})) { + $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, + $parser,$safeeval); + $head_tag_start=''.&Apache::lonxml::registerurl(undef,$target); + } + my $body_tag_start; + if (!defined($found{'body'})) { + $body_tag_start='The resource needs to be checked out +As a resource gets checked out, a unique timestamped ID is given to it, and a +permanent record is left in the system.

+ +Checking out resources is subject to course policies, and may exclude future +credit even if done erroneously.

+ +

+ + +
+ENDCHECKOUT } sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + # 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[-1]); + return ''; + } #intialize globals $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); + @Apache::inputtags::previous=(); + if ($target ne 'analyze') { + &initialize_storage(); + if ($target eq 'web') { + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + } + $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); + &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); + } + if ($Apache::lonhomework::type eq '') { + my $uri=$ENV{'request.uri'}; + if ($uri=~/\.(\w+)$/) { + $Apache::lonhomework::type=$1; + &Apache::lonxml::debug("Using type of $1"); + } else { + $Apache::lonhomework::type='problem'; + &Apache::lonxml::debug("Using default type, problem, :$uri:"); + } + } -#adeed vars to the scripting enviroment + #added vars to the scripting enviroment my $expression='$external::part='.$Apache::inputtags::part.';'; &Apache::run::run($expression,$safeeval); my $status; - my $datemsg; + my $accessmsg; #should get back a or the neccesary stuff to start XML/MathML - my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); + my ($result,$head_tag_start,$body_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); - my $head_tag_start=''.&Apache::lonxml::registerurl(); - my $body_tag_start=''; - if ($target eq 'web' || $target eq 'grade') { - ($status,$datemsg) = &Apache::lonhomework::check_date('0'); + + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + #handle exam checkout + if ($Apache::lonhomework::type eq 'exam') { + my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; + if (($ENV{'form.doescheckout'}) && (!$token)) { + $token=&Apache::lonxml::maketoken(); + $Apache::lonhomework::history{"resource.0.outtoken"}=$token; + } + $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); + } + + #handle rand seed in construction space + my $rndseed; + if ($ENV{'request.state'} eq "construct") { + $rndseed=$ENV{'form.rndseed'}; + if (!$rndseed) { + $rndseed=time; + $ENV{'form.rndseed'}=$rndseed; + } + &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); + } + ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; &Apache::run::run($expression,$safeeval); - if ( $status eq 'CLOSED' ) { + if (( $status eq 'CLOSED' ) || + ( $status eq 'UNCHECKEDOUT') || + ( $status eq 'BANNED')) { my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); if ( $target eq "web" ) { $result.= $head_tag_start.''; - return $result . $body_tag_start . - "
Problem is not open to be viewed. The problem $datemsg
"; + my $msg=$body_tag_start. + '

Not open to be viewed

'; + if ($status eq 'CLOSED') { + $msg.='The problem '.$accessmsg; + } elsif ($status eq 'UNCHECKEDOUT') { + $msg.=&checkout_msg; + } + $result.=$msg.'
'; } - } - } - if ($target eq 'web') { - my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); - if ($name eq '') { - $name=&Apache::lonnet::EXT('resource.title'); - if ($name eq 'con_lost') { $name = ''; } - } - $Apache::lonhomework::name=$name; - if ($status eq 'CAN_ANSWER') { - # create a page header and exit - $result.="$head_tag_start$name\n + } elsif ($target eq 'web') { + my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; + if ($status eq 'CAN_ANSWER') { + # create a page header and exit + $result.="$head_tag_start$name\n $body_tag_start\n
". ''; - if ($ENV{'request.state'} eq "construct") { - $result.=' -
'; - } - return $result; - } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { - return $result.$head_tag_start."$name\n$body_tag_start\n"; + if ($ENV{'request.state'} eq "construct") { + $result.= + ' + + + Random Seed: + + +
'; + } + # if we are viewing someone else preserve that info + if (defined $ENV{'form.grade_symb'}) { + foreach my $field ('symb','courseid','domain','username') { + $result .= ''."\n"; + } + } + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' + || $status eq 'CLOSED') { + $result.=$head_tag_start. + "$name\n$body_tag_start\n"; + } } - } - if ($target eq 'edit') { + } elsif ($target eq 'edit') { $result.=$head_tag_start."".$body_tag_start. - ' + ' +
+
'; my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; - return $result; - } - if ($target eq 'modified') { + } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); - return $result; + } elsif ($target eq 'tex') { + $result .= '\begin{document} '; + } else { + # page_start returned a starting result, delete it if we don't need it + $result = ''; } - return ''; + return $result; } sub end_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $status=$Apache::inputtags::status['-1']; - if ($target eq 'grade' || $target eq 'web' ) { - if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && - $status eq 'CAN_ANSWER') { + if ($target eq 'grade' || $target eq 'web' || $target eq '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 ($Apache::inputtags::part eq '0') { + } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' && + $status ne 'UNCHECKEDOUT') { # if part is zero, no s existed, so we need show the current # grading status $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); } - if ($target eq 'web') { + if ( + ($target eq 'web' && ($ENV{'request.state'} ne 'construct')) || + ($target eq 'answer') + ) { if ($status eq 'CAN_ANSWER') { $result.="\n"; - } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || + $status eq 'UNCHECKEDOUT' ) { $result.="\n"; } + $result.=&Apache::lonxml::xmlend(); } - } - if ($target eq 'meta') { + if ($target eq 'grade') { + &Apache::lonhomework::showhash(%Apache::lonhomework::results); + &finalize_storage(); + } + } elsif ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { $result=&Apache::response::mandatory_part_meta; } + } 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; +} + +sub start_library { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($result,$head_tag_start,$body_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + if ($target eq 'edit') { + $result.=$head_tag_start."".$body_tag_start. + '
+ + + +
+ '; + my $temp=&Apache::edit::insertlist($target,$token); + $result.=$temp; + return $result; + } + if ($target eq 'modified') { + $result=$token->[4]; + $result.=&Apache::edit::handle_insert(); + return $result; + } + return ''; +} + +sub end_library { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; if ($target eq 'edit') { - &Apache::lonxml::debug("in end_problem with $target, edit"); $result='
'; } return $result; @@ -149,7 +385,7 @@ sub end_problem { sub start_block { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { my $code = @$parstack[$#$parstack]; $code =~ s/\"//g; $code .=';return $condition;'; @@ -204,63 +440,87 @@ sub end_while { # sub start_randomlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); - my $b_parser= HTML::TokeParser->new(\$body); - my $b_tok; - my @randomlist; - my $list_item; - - while($b_tok = $b_parser->get_token() ) { - if($b_tok->[0] eq 'S') { # start tag - # get content of the tag until matching end tag - # get all text upto the matching tag - # and push the content into @randomlist - $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser); - $list_item = "$b_tok->[4]"."$list_item"."[1]>"; - push(@randomlist,$list_item); - # print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item"; - } - if($b_tok->[0] eq 'T') { # text - # what to do with text in between tags? - # print "TEXT $b_tok->[1]
"; - } - # if($b_tok->[0] eq 'E') { # end tag, should not happen + 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); + my $b_tok; + my @randomlist; + my $list_item; + while($b_tok = $b_parser->get_token() ) { + if($b_tok->[0] eq 'S') { # start tag + # get content of the tag until matching end tag + # get all text upto the matching tag + # and push the content into @randomlist + $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser); + $list_item = "$b_tok->[4]"."$list_item"."[1]>"; + push(@randomlist,$list_item); + # print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item"; + } + if($b_tok->[0] eq 'T') { # text + # what to do with text in between tags? + # print "TEXT $b_tok->[1]
"; + } + # if($b_tok->[0] eq 'E') { # end tag, should not happen # print "END-TAG $b_tok->[1]
"; - # } - } - my @idx_arr = (0 .. $#randomlist); - &Apache::structuretags::shuffle(\@idx_arr); - my $bodytext = ''; - for(0 .. $#randomlist) { - $bodytext .= "$randomlist[ $idx_arr[$_] ]"; + # } + } + my @idx_arr = (0 .. $#randomlist); + &Apache::structuretags::shuffle(\@idx_arr); + my $bodytext = ''; + 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); } } - - &Apache::lonxml::newparser($parser,\$bodytext); - return ""; + return $result; } sub shuffle { my $a=shift; my $i; - for($i=@$a;--$i;) { - my $j=int rand($i+1); - next if $i == $j; - @$a[$i,$j] = @$a[$j,$i]; + if (defined(@$a)) { + &Apache::response::setrandomnumber(); + for($i=@$a;--$i;) { + my $j=int rand($i+1); + next if $i == $j; + @$a[$i,$j] = @$a[$j,$i]; + } } } sub end_randomlist { + 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 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + if ($id eq '') { $id = $Apache::lonxml::curdepth; } $Apache::inputtags::part=$id; @Apache::inputtags::responselist = (); + @Apache::inputtags::previous=(); if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; - } elsif ($target eq 'web' || $target eq 'grade') { - my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id); + } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; @@ -268,11 +528,15 @@ sub start_part { if ( $status eq 'CLOSED' ) { my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]); if ( $target eq "web" ) { - return "
Part is not open to be viewed. It $datemsg
"; + return "
Part is not open to be viewed. It $accessmsg
"; } } } - return ''; + if ($target eq 'tex') { + return '\\\\'; + } else { + return ''; + } } sub end_part { @@ -292,7 +556,7 @@ sub end_part { sub start_preduedate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); @@ -321,7 +585,7 @@ sub end_postanswerdate { sub start_notsolved { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; &Apache::lonxml::debug("not solved has :$gradestatus:"); if ($gradestatus =~ /^correct/) { @@ -338,7 +602,7 @@ sub end_notsolved { sub start_solved { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; if ($gradestatus !~ /^correct/) { &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]); @@ -363,21 +627,29 @@ sub end_startouttext { my $text=''; if ($target eq 'edit') { - $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]); - $result= - &Apache::edit::tag_start($target,$token). - &Apache::edit::editfield($token->[1],$text,"Text Block",50,5); + $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]); + $result.=&Apache::edit::start_table($token)."Text Block +Delete:". + &Apache::edit::deletelist($target,$token) + ." +". + &Apache::edit::insertlist($target,$token). + &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 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; - if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); } + if ($target eq "edit" ) { $result="".&Apache::edit::end_table()."\n"; } if ($target eq "modified") { $result=''; } return $result; } @@ -387,7 +659,19 @@ sub end_endouttext { if ($target eq "edit" || $target eq 'modified') { @result=('','no'); } return (@result); } - +sub delete_startouttext { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; +# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); + my $text=$$parser['-1']->get_text("/endouttext"); + my $ntoken=$$parser['-1']->get_token(); + &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext"); + &Apache::lonxml::end_tag($tagstack,$parstack,$ntoken); + # Deleting 2 parallel tag pairs, but we need the numbers later to look like + # they did the last time round + &Apache::lonxml::increasedepth($ntoken); + &Apache::lonxml::decreasedepth($ntoken); + return 1; +} 1; __END__