loncom/homework/structuretags.pm - diff

Return to structuretags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.66 and 1.97

version 1.66, 2001/08/22 19:21:36	version 1.97, 2002/06/21 20:27:54
Line 1	Line 1
# The LearningOnline Network with CAPA	# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document	# definition of tags that give a structure to a document
	#
	# $Id$
	#
	# 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	# 2/19 Guy
# 6/26/2001 fixed extra web display at end of <web></web> tags	# 6/26/2001 fixed extra web display at end of <web></web> tags
# 8/17,8/18,8/20 Gerd Kortemeyer	# 8/17,8/18,8/20 Gerd Kortemeyer
Line 9 package Apache::structuretags;	Line 34 package Apache::structuretags;
use strict;	use strict;
use Apache::lonnet;	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('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))	# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
}	}
Line 42 sub end_tex {	Line 67 sub end_tex {

sub page_start {	sub page_start {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);	my %found;
my $head_tag_start='<head>'.&Apache::lonxml::registerurl();	foreach my $taginside ($tagstack) {
my $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.	foreach my $taglookedfor ('html','body','form') {
'onUnload="'.&Apache::lonxml::unloadevents().'" ';	if ($taginside =~ /^$taglookedfor$/i) { $found{$taglookedfor} = 1; }
my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);	}
if ($background) {	}
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$background;	my $result;
$body_tag_start.='background="'.$background.'" ';	my $head_tag_start;
} else {	if (!defined($found{'html'})) {
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);	$result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,
if ($bgcolor) {	$parser,$safeeval);
$body_tag_start.='bgcolor="'.$bgcolor.'" ';	$head_tag_start='<head>'.&Apache::lonxml::registerurl(undef,$target);
	}
	my $body_tag_start;
	if (!defined($found{'body'})) {
	$body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.
	'onUnload="'.&Apache::lonxml::unloadevents().'" ';
	my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);
	if ($background) {
	$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
	$background;
	$body_tag_start.='background="'.$background.'" ';
} else {	} else {
$body_tag_start.='bgcolor="#ffffff"';	my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);
	if ($bgcolor) {
	$body_tag_start.='bgcolor="'.$bgcolor.'" ';
	} else {
	$body_tag_start.='bgcolor="#ffffff"';
	}
}	}
	$body_tag_start.='>';
}	}
$body_tag_start.='>';
return ($result,$head_tag_start,$body_tag_start);	return ($result,$head_tag_start,$body_tag_start);
}	}

sub initialize_storage {	sub initialize_storage {
%Apache::lonhomework::results=();	%Apache::lonhomework::results=();
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
%Apache::lonhomework::history=	if ($ENV{'request.state'} eq 'construct') {
&Apache::lonnet::restore($symb,$courseid,$domain,$name);	%Apache::lonhomework::history=
	&Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
	my ($temp)=keys %Apache::lonhomework::history ;
	&Apache::lonxml::debug("Return message of $temp");
	} else {
	%Apache::lonhomework::history=
	&Apache::lonnet::restore($symb,$courseid,$domain,$name);
	}
#ignore error conditions	#ignore error conditions
my ($temp)=keys %Apache::lonhomework::history ;	my ($temp)=keys %Apache::lonhomework::history ;
if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }	if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
Line 82 sub finalize_storage {	Line 129 sub finalize_storage {
my ($temp) = keys %Apache::lonhomework::results;	my ($temp) = keys %Apache::lonhomework::results;
if ( $temp ne '' ) {	if ( $temp ne '' ) {
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,	if ($ENV{'request.state'} eq 'construct') {
$symb,$courseid,$domain,$name);	$result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
&Apache::lonxml::debug("Store return message:".$result);	$ENV{'request.uri'},'',$domain,$name);
	&Apache::lonxml::debug('Construct Store return message:'.$result);
	} else {
	$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
	$symb,$courseid,$domain,$name);
	&Apache::lonxml::debug('Store return message:'.$result);
	}
}	}
return $result;	return $result;
}	}
Line 97 permanent record is left in the system.<	Line 150 permanent record is left in the system.<
<font color=red>	<font color=red>
Checking out resources is subject to course policies, and may exclude future	Checking out resources is subject to course policies, and may exclude future
credit even if done erroneously.<p />	credit even if done erroneously.<p />
</font>	</font>
<form method=post>	<form name="checkout" method="POST" action="$ENV{'request.uri'}">
<input type=button name="doescheckout"	<input type="hidden" name="doescheckout" value="yes" />
value="Check out Exam for Viewing"	<input type="button" name="checkoutbutton" value="Check out Exam for Viewing" onClick="javascript:if (confirm('Check out Exam?')) { document.checkout.submit(); }" />
onClick="if (confirm('Check out Exam?')) { this.form.submit(); }" />
</form>	</form>
ENDCHECKOUT	ENDCHECKOUT
}	}
Line 109 ENDCHECKOUT	Line 161 ENDCHECKOUT
sub start_problem {	sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	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	#intialize globals
$Apache::inputtags::part='0';	$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();	@Apache::inputtags::responselist = ();
@Apache::inputtags::previous=();	@Apache::inputtags::previous=();
&initialize_storage();	if ($target ne 'analyze') {
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');	&initialize_storage();
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");	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 '') {	if ($Apache::lonhomework::type eq '') {
my $uri=$ENV{'request.uri'};	my $uri=$ENV{'request.uri'};
if ($uri=~/\.(\w+)$/) {	if ($uri=~/\.(\w+)$/) {
Line 127 sub start_problem {	Line 192 sub start_problem {
}	}
}	}

#added vars to the scripting enviroment	#added vars to the scripting enviroment
my $expression='$external::part='.$Apache::inputtags::part.';';	my $expression='$external::part='.$Apache::inputtags::part.';';
&Apache::run::run($expression,$safeeval);	&Apache::run::run($expression,$safeeval);
my $status;	my $status;
Line 136 sub start_problem {	Line 201 sub start_problem {
#should get back a <html> or the neccesary stuff to start XML/MathML	#should get back a <html> or the neccesary stuff to start XML/MathML
my ($result,$head_tag_start,$body_tag_start)=	my ($result,$head_tag_start,$body_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);	&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
	if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}

if ($Apache::lonhomework::type eq 'exam') {	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer') {
if ($target eq 'web') {	#handle exam checkout
my $token=$Apache::lonhomework::history{"resource.0.outtoken"};	if ($Apache::lonhomework::type eq 'exam') {
if (($ENV{'form.doescheckout'}) && (!$token)) {	my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
$token=&Apache::lonxml::maketoken();	if (($ENV{'form.doescheckout'}) && (!$token)) {
$Apache::lonhomework::history{"resource.0.outtoken"}=$token;	$token=&Apache::lonxml::maketoken();
}	$Apache::lonhomework::history{"resource.0.outtoken"}=$token;
$body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
}	}
}	$body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
if ($target eq 'web' \|\| $target eq 'grade') {	}

	#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');	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);	push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';	my $expression='$external::datestatus="'.$status.'";';
Line 166 sub start_problem {	Line 242 sub start_problem {
} elsif ($status eq 'UNCHECKEDOUT') {	} elsif ($status eq 'UNCHECKEDOUT') {
$msg.=&checkout_msg;	$msg.=&checkout_msg;
}	}
return $result.$msg.'<br />';	$result.=$msg.'<br />';
}	}
}	} elsif ($target eq 'web') {
}	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
if ($target eq 'web') {	if ($name eq '') {
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);	$name=&Apache::lonnet::EXT('resource.title');
if ($name eq '') {	if ($name eq 'con_lost') { $name = ''; }
$name=&Apache::lonnet::EXT('resource.title');	}
if ($name eq 'con_lost') { $name = ''; }	$Apache::lonhomework::name=$name;
}	if ($status eq 'CAN_ANSWER') {
$Apache::lonhomework::name=$name;	# create a page header and exit
if ($status eq 'CAN_ANSWER') {	$result.="$head_tag_start<title>$name</title></head>\n
# create a page header and exit
$result.="$head_tag_start<title>$name</title></head>\n
$body_tag_start\n	$body_tag_start\n
<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".	<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".
'<input type="hidden" name="submitted" value="yes" />';	'<input type="hidden" name="submitted" value="yes" />';
if ($ENV{'request.state'} eq "construct") {	if ($ENV{'request.state'} eq "construct") {
$result.='<input type="hidden" name="problemmode" value="View" />	$result.=
<input type="submit" name="problemmode" value="Edit" /><hr />';	'<input type="hidden" name="problemmode" value="View" />
}	<input type="submit" name="problemmode" value="Edit" />
# if we are viewing someone else preserve that info	<input type="submit" name="problemmode" value="EditXML" />
if (defined $ENV{'form.grade_symb'}) {	Random Seed:<input type="text" name="rndseed" width="10" value="'.
foreach my $field ('symb','courseid','domain','username') {	$rndseed.'" />
$result .= '<input type="hidden" name="grade_'.$field.	<input type="submit" name="changerandseed" value="Change" />
'" value="'.$ENV{"form.grade_$field"}.'" />'."\n";	<input type="submit" name="resetdata" value="Reset Submissions" />
	<input type="checkbox" name="showallfoils" ';
	if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
	$result.= ' /> Show All Foils
	<hr />';
}	}
	# if we are viewing someone else preserve that info
	if (defined $ENV{'form.grade_symb'}) {
	foreach my $field ('symb','courseid','domain','username') {
	$result .= '<input type="hidden" name="grade_'.$field.
	'" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
	}
	}
	} elsif ($status eq 'SHOW_ANSWER' \|\| $status eq 'CANNOT_ANSWER'
	\|\| $status eq 'CLOSED') {
	$result.=$head_tag_start.
	"<title>$name</title></head>\n$body_tag_start\n";
}	}
return $result;
} elsif ($status eq 'SHOW_ANSWER' \|\| $status eq 'CANNOT_ANSWER' \|\| $status eq 'CLOSED') {
return $result.$head_tag_start."<title>$name</title></head>\n$body_tag_start\n";
}	}
}	} elsif ($target eq 'edit') {
if ($target eq 'edit') {
$result.=$head_tag_start."</head>".$body_tag_start.	$result.=$head_tag_start."</head>".$body_tag_start.
'<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">	'<form name="lonhomework" method="POST" action="'.
	$ENV{'request.uri'}.'">
<input type="hidden" name="submitted" value="edit" />	<input type="hidden" name="submitted" value="edit" />
<input type="hidden" name="problemmode" value="Edit" />	<input type="hidden" name="problemmode" value="Edit" />
<input type="submit" name="problemmode" value="View" />	<input type="submit" name="problemmode" value="Discard Edits and View" />
	<input type="submit" name="problemmode" value="EditXML" />
<input type="submit" name="Undo" value="undo" /> <hr />	<input type="submit" name="Undo" value="undo" /> <hr />
<input type="submit" name="submit" value="Submit Changes" /><br />	<input type="submit" name="submit" value="Submit Changes" />
	<input type="submit" name="submit" value="Submit Changes and View" /><br />
';	';
my $temp=&Apache::edit::insertlist($target,$token);	my $temp=&Apache::edit::insertlist($target,$token);
$result.=$temp;	$result.=$temp;
return $result;	} elsif ($target eq 'modified') {
}
if ($target eq 'modified') {
$result=$token->[4];	$result=$token->[4];
$result.=&Apache::edit::handle_insert();	$result.=&Apache::edit::handle_insert();
return $result;	} elsif ($target eq 'tex') {
	if (not $ENV{'request.symb'} =~ m/\.page_/) {
	$result .= '\begin{document} ';
	} else {
	$result .= '\begin{minipage}{\minipagewidth} ';
	}
	} else {
	# page_start returned a starting result, delete it if we don't need it
	$result = '';
}	}
return '';	return $result;
}	}

sub end_problem {	sub end_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';	my $result='';
my $status=$Apache::inputtags::status['-1'];	my $status=$Apache::inputtags::status['-1'];
if ($target eq 'grade' \|\| $target eq 'web' ) {	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'answer' ) {
if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&	if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
$status eq 'CAN_ANSWER') {
# if part is zero, no <part>s existed, so we need to the grading	# if part is zero, no <part>s existed, so we need to the grading
&Apache::inputtags::grade;	&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 <part>s existed, so we need show the current	# if part is zero, no <part>s existed, so we need show the current
# grading status	# grading status
$result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);	$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') {	if ($status eq 'CAN_ANSWER') {
$result.="</form></body>\n";	$result.="</form></body>\n";
} elsif ($status eq 'SHOW_ANSWER' \|\| $status eq 'CANNOT_ANSWER') {	} elsif ($status eq 'SHOW_ANSWER' \|\| $status eq 'CANNOT_ANSWER' \|\|
	$status eq 'UNCHECKEDOUT' ) {
$result.="</body>\n";	$result.="</body>\n";
}	}
$result.=&Apache::lonxml::xmlend();	$result.=&Apache::lonxml::xmlend();
Line 252 sub end_problem {	Line 350 sub end_problem {
}	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");	&Apache::lonxml::debug("in end_problem with $target, edit");
$result='<br /><input type="submit" name="submit" value="Submit Changes" />';	$result ='<br /><input type="submit" name="submit" value="Submit Changes and Edit" />';
	$result.='<input type="submit" name="submit" value="Submit Changes and View" />';
	} elsif ($target eq 'tex') {
	$result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}';
	if (not $ENV{'request.symb'} =~ m/\.page_/) {
	$result .= '\end{document} ';
	} else {
	$result .= '\end{minipage} ';
	}
}	}
return $result;	return $result;
}	}
Line 293 sub end_library {	Line 399 sub end_library {
sub start_block {	sub start_block {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	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];	my $code = @$parstack[$#$parstack];
$code =~ s/\"//g;	$code =~ s/\"//g;
$code .=';return $condition;';	$code .=';return $condition;';
Line 348 sub end_while {	Line 454 sub end_while {
# </randomlist>	# </randomlist>
sub start_randomlist {	sub start_randomlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);	my $result;
my $b_parser= HTML::TokeParser->new(\$body);	if ($target eq 'answer' \|\| $target eq 'grade' \|\| $target eq 'web') {
my $b_tok;	my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
my @randomlist;	my $b_parser= HTML::TokeParser->new(\$body);
my $list_item;	my $b_tok;
	my @randomlist;
while($b_tok = $b_parser->get_token() ) {	my $list_item;
if($b_tok->[0] eq 'S') { # start tag	while($b_tok = $b_parser->get_token() ) {
# get content of the tag until matching end tag	if($b_tok->[0] eq 'S') { # start tag
# get all text upto the matching tag	# get content of the tag until matching end tag
# and push the content into @randomlist	# get all text upto the matching tag
$list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);	# and push the content into @randomlist
$list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";	$list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
push(@randomlist,$list_item);	$list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";
# print "<br /><b>START-TAG $b_tok->[1], $b_tok->[4], $list_item</b>";	push(@randomlist,$list_item);
}	# print "<br /><b>START-TAG $b_tok->[1], $b_tok->[4], $list_item</b>";
if($b_tok->[0] eq 'T') { # text	}
# what to do with text in between tags?	if($b_tok->[0] eq 'T') { # text
# print "<b>TEXT $b_tok->[1]</b><br />";	# what to do with text in between tags?
}	# print "<b>TEXT $b_tok->[1]</b><br />";
# if($b_tok->[0] eq 'E') { # end tag, should not happen	}
	# if($b_tok->[0] eq 'E') { # end tag, should not happen
# print "<b>END-TAG $b_tok->[1]</b><br />";	# print "<b>END-TAG $b_tok->[1]</b><br />";
# }	# }
}	}
my @idx_arr = (0 .. $#randomlist);	my @idx_arr = (0 .. $#randomlist);
&Apache::structuretags::shuffle(\@idx_arr);	&Apache::structuretags::shuffle(\@idx_arr);
my $bodytext = '';	my $bodytext = '';
for(0 .. $#randomlist) {	my $show=$#randomlist;
$bodytext .= "$randomlist[ $idx_arr[$_] ]";	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 $result;
&Apache::lonxml::newparser($parser,\$bodytext);
return "";
}	}

sub shuffle {	sub shuffle {
my $a=shift;	my $a=shift;
my $i;	my $i;
&Apache::response::setrandomnumber();	if (defined(@$a)) {
for($i=@$a;--$i;) {	&Apache::response::setrandomnumber();
my $j=int rand($i+1);	for($i=@$a;--$i;) {
next if $i == $j;	my $j=int rand($i+1);
@$a[$i,$j] = @$a[$j,$i];	next if $i == $j;
	@$a[$i,$j] = @$a[$j,$i];
	}
}	}
}	}

sub end_randomlist {	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 {	sub start_part {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
	my $result='';
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);	my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if ($id eq '') { $id = $Apache::lonxml::curdepth; }	if ($id eq '') { $id = $Apache::lonxml::curdepth; }
$Apache::inputtags::part=$id;	$Apache::inputtags::part=$id;
Line 407 sub start_part {	Line 534 sub start_part {
@Apache::inputtags::previous=();	@Apache::inputtags::previous=();
if ($target eq 'meta') {	if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;	return &Apache::response::mandatory_part_meta;
} elsif ($target eq 'web' \|\| $target eq 'grade') {	} elsif ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\| $target eq 'tex') {
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);	my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
push (@Apache::inputtags::status,$status);	push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';	my $expression='$external::datestatus="'.$status.'";';
Line 416 sub start_part {	Line 543 sub start_part {
if ( $status eq 'CLOSED' ) {	if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);	my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
if ( $target eq "web" ) {	if ( $target eq "web" ) {
return "<br />Part is not open to be viewed. It $accessmsg<br />";	$result="<br />Part is not open to be viewed. It $accessmsg<br />";
	} elsif ( $target eq 'tex' ) {
	$result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
	}
	} else {
	if ($target eq 'tex') {
	$result='\vskip 0 mm';
}	}
}	}
}	}
return '';	return $result;
}	}

sub end_part {	sub end_part {
Line 440 sub end_part {	Line 573 sub end_part {

sub start_preduedate {	sub start_preduedate {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	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' &&	if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
&Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);	&Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
Line 469 sub end_postanswerdate {	Line 602 sub end_postanswerdate {

sub start_notsolved {	sub start_notsolved {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	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"};	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
&Apache::lonxml::debug("not solved has :$gradestatus:");	&Apache::lonxml::debug("not solved has :$gradestatus:");
if ($gradestatus =~ /^correct/) {	if ($gradestatus =~ /^correct/) {
Line 486 sub end_notsolved {	Line 619 sub end_notsolved {

sub start_solved {	sub start_solved {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	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"};	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
if ($gradestatus !~ /^correct/) {	if ($gradestatus !~ /^correct/) {
&Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);	&Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);
Line 511 sub end_startouttext {	Line 644 sub end_startouttext {
my $text='';	my $text='';

if ($target eq 'edit') {	if ($target eq 'edit') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);	$text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]);
$result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>	$result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
<td>Delete:".	<td>Delete:".
&Apache::edit::deletelist($target,$token)	&Apache::edit::deletelist($target,$token)
."</td>	."</td>
<td>".	<td>".
&Apache::edit::insertlist($target,$token).	&Apache::edit::insertlist($target,$token).
"</td>	&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n".
</tr><tr><td colspan=\"3\">\n".	&Apache::edit::editfield($token->[1],$text,"",50,4);
&Apache::edit::editfield($token->[1],$text,"",50,4);
}	}
if ($target eq 'modified') {	if ($target eq 'modified') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);	$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
$result='<startouttext />'.&Apache::edit::modifiedfield();	$result='<startouttext />'.&Apache::edit::modifiedfield();
}	}
	if ($target eq 'tex') {
	$result .= '\noindent ';
	}
return $result;	return $result;
}	}
sub start_endouttext {	sub start_endouttext {
Line 545 sub delete_startouttext {	Line 680 sub delete_startouttext {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);	# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
my $text=$$parser['-1']->get_text("/endouttext");	my $text=$$parser['-1']->get_text("/endouttext");
my $token=$$parser['-1']->get_token();	my $ntoken=$$parser['-1']->get_token();
&Apache::lonxml::debug("Deleting :$text: and :$token->[0]:$token->[1]:$token->[2]: for startouttext");	&Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");
&Apache::lonxml::end_tag($tagstack,$parstack,$token);	&Apache::lonxml::end_tag($tagstack,$parstack,$ntoken);
# Deleting 2 parallel tag pairs, but we need the numbers later to look like	# Deleting 2 parallel tag pairs, but we need the numbers later to look like
# they did the last time round	# they did the last time round
&Apache::lonxml::increasedepth($token);	&Apache::lonxml::increasedepth($ntoken);
&Apache::lonxml::decreasedepth($token);	&Apache::lonxml::decreasedepth($ntoken);
return 1;	return 1;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.66
changed lines
	Added in v.1.97