loncom/xml/scripttag.pm - diff

Return to scripttag.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/scripttag.pm between versions 1.55 and 1.77

version 1.55, 2001/10/14 05:08:09	version 1.77, 2002/09/23 17:25:24
Line 1	Line 1
# The LearningOnline Network with CAPA	# The LearningOnline Network with CAPA
# <script> definiton	# <script> definiton
	#
	# $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/21 Guy	# 2/21 Guy
# 8/20 Gerd Kortemeyer	# 8/20 Gerd Kortemeyer

Line 14 use Apache::style;	Line 39 use Apache::style;
# so xmlparse can reenter the inner_xmlparse loop.	# so xmlparse can reenter the inner_xmlparse loop.

@Apache::scripttag::parser_env = ();	@Apache::scripttag::parser_env = ();
sub BEGIN {	BEGIN {
&Apache::lonxml::register('Apache::scripttag',('script','scriptlib',	&Apache::lonxml::register('Apache::scripttag',
'parserlib','import',	('script','scriptlib','parserlib','import',
'window','display',	'window','display','storetc','physnet',
'storetc','physnet'));	'standalone','comment'));
}	}

sub start_script {	sub start_script {
Line 34 sub start_script {	Line 59 sub start_script {
} elsif ( $target eq 'web' \|\| $target eq 'tex' \|\|	} elsif ( $target eq 'web' \|\| $target eq 'tex' \|\|
$target eq 'grade' \|\| $target eq 'answer') {	$target eq 'grade' \|\| $target eq 'answer') {
&Apache::run::run($bodytext,$safeeval);	&Apache::run::run($bodytext,$safeeval);
if (($ENV{'request.state'} eq 'construct') && ($target eq 'answer')) {	if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
$Apache::lonxml::evaluate--;	$Apache::lonxml::evaluate--;
$result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor="#FFFFFF"><pre>";	$result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor="#FFFFFF"><pre>";
my $listing= &Apache::run::dump($target,$safeeval);	my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
$listing =~ s/\n/\\n/g;
$result.=$listing;	$result.=$listing;
$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";	$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
}	}
Line 46 sub start_script {	Line 71 sub start_script {
#&Apache::run::run($bodytext,$safeeval);	#&Apache::run::run($bodytext,$safeeval);
#$result="<br /> <$token->[1]> output: <br />$bodytext<br />Source:<br />";	#$result="<br /> <$token->[1]> output: <br />$bodytext<br />Source:<br />";
$result=&Apache::edit::tag_start($target,$token,'Script');	$result=&Apache::edit::tag_start($target,$token,'Script');
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',50,4);	$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
}	}
} else {	} else {
if ($target ne "meta") { $result = $token->[4]; }	if ($target ne "meta") {
	$result = $token->[4];
	my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
	$result.=$bodytext;
	}
}	}
return $result;	return $result;
}	}
Line 64 sub end_script {	Line 93 sub end_script {
return $token->[2];	return $token->[2];
} elsif ($target eq 'edit' ) {	} elsif ($target eq 'edit' ) {
return &Apache::edit::end_table();	return &Apache::edit::end_table();
} elsif (($ENV{'request.state'} eq 'construct') && ($target eq 'answer')) {	} elsif (($target eq 'answer')) {
$Apache::lonxml::evaluate++;	$Apache::lonxml::evaluate++;
}	}
return '';	return '';
Line 89 sub start_display {	Line 118 sub start_display {
# "<br /> <$token->[1]> output: <br />$bodytext<br />Source:<br />";	# "<br /> <$token->[1]> output: <br />$bodytext<br />Source:<br />";
#$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);	#$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
$result=&Apache::edit::tag_start($target,$token,'Script With Display');	$result=&Apache::edit::tag_start($target,$token,'Script With Display');
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1)	$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,1)
}	}
return $result;	return $result;
}	}
Line 127 sub start_scriptlib {	Line 156 sub start_scriptlib {
if ($target eq "edit" ) {	if ($target eq "edit" ) {
$result=	$result=
&Apache::edit::tag_start($target,$token,'New Script Functions').	&Apache::edit::tag_start($target,$token,'New Script Functions').
&Apache::edit::editfield($token->[1],$bodytext,'',40,1).	&Apache::edit::editline($token->[1],$bodytext,'',40).
$error.'</td></tr>'.	$error.'</td></tr>'.
&Apache::edit::end_table();	&Apache::edit::end_table();
}	}
if ($target eq "modified" ) {	if ($target eq "modified" ) {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");	$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
$result=&Apache::edit::modifiedfield($token);	$result=$token->[4].&Apache::edit::modifiedfield($token);
&Apache::lonxml::debug($result);	&Apache::lonxml::debug($result);
}	}
return $result;	return $result;
Line 172 sub start_parserlib {	Line 201 sub start_parserlib {
if ($target eq "edit" ) {	if ($target eq "edit" ) {
$result=	$result=
&Apache::edit::tag_start($target,$token,'New Tag Definitions').	&Apache::edit::tag_start($target,$token,'New Tag Definitions').
&Apache::edit::editfield($token->[1],$bodytext,'',40,1).	&Apache::edit::editline($token->[1],$bodytext,'',40).
$error.'</td></tr>'.	$error.'</td></tr>'.
&Apache::edit::end_table();	&Apache::edit::end_table();
}	}
if ($target eq "modified" ) {	if ($target eq "modified" ) {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");	$bodytext=$$parser[$#$parser]->get_text("/parserlib");
$result=&Apache::edit::modifiedfield($token);	$result=$token->[4].&Apache::edit::modifiedfield($token);
&Apache::lonxml::debug($result);	&Apache::lonxml::debug($result);
}	}
return $result;	return $result;
Line 224 sub start_import {	Line 253 sub start_import {

$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);	$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);

if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer') {	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|$target eq 'tex') {
# FIXME this probably needs to be smart about construction vs.	# FIXME this probably needs to be smart about construction vs.
# non construction space.	# non construction space.
my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);	my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
Line 237 sub start_import {	Line 266 sub start_import {
my $dir=$location;	my $dir=$location;
$dir=~s:/[^/]*$::;	$dir=~s:/[^/]*$::;
# &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");	# &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");
	my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
	if (!$id) { $id=$Apache::lonxml::curdepth; }
	push(@Apache::inputtags::import,$id);
&Apache::lonxml::newparser($parser,\$file,$dir);	&Apache::lonxml::newparser($parser,\$file,$dir);
}	} elsif ($target eq "edit" ) {
if ($target eq "edit" ) {
$result.=&Apache::edit::tag_start($target,$token);	$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);	$result.=&Apache::edit::editline($token->[1],$bodytext,'',40);
#FIXME this need to convert $bodytext to be a contruction space reference	#FIXME this need to convert $bodytext to be a contruction space reference
#my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);	#my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
#$result.="Click<a href=\"$location\">here</a> to edit<br />"	#$result.="Click<a href=\"$location\">here</a> to edit<br />"
}	} elsif ($target eq 'modified') {
if ($target eq 'modified') {
$bodytext=$$parser[$#$parser]->get_text("/import");	$bodytext=$$parser[$#$parser]->get_text("/import");
$result=&Apache::edit::modifiedfield($token);	$result=$token->[4].&Apache::edit::modifiedfield($token);
&Apache::lonxml::debug($result);	&Apache::lonxml::debug($result);
	} elsif ($target eq 'meta') {
	my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
	$result.='<import part="'.$Apache::inputtags::part;
	if ($id) {
	$result.='" id="'.$id;
	}
	$result.='">';
	$result.=$bodytext;
	$result.='</import>';
}	}
return $result;	return $result;
}	}

sub end_import {	sub end_import {
return '';	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	pop(@Apache::inputtags::import);
	my $result;
	if ($target eq 'edit' ) { $result=&Apache::edit::end_table(); }
	return $result;
}	}

sub start_storetc {	sub start_storetc {
Line 282 sub start_physnet {	Line 325 sub start_physnet {
my $cbistyletext=&Apache::lonnet::getfile($location);	my $cbistyletext=&Apache::lonnet::getfile($location);

%$style = (%$style,&Apache::style::styleparser($target,$cbistyletext));	%$style = (%$style,&Apache::style::styleparser($target,$cbistyletext));
if ( defined($$style{'physnet'}) ) {	$$parser['-1']->unget_token($token);
&Apache::lonxml::newparser($parser,\$$style{'physnet'});	# if ( defined($$style{'physnet'}) ) {
}	# &Apache::lonxml::newparser($parser,\$$style{'physnet'});
	# }
return "";	return "";
}	}

Line 292 sub end_physnet {	Line 336 sub end_physnet {
return '';	return '';
}	}

	sub start_standalone {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result='';
	if ($target eq 'web' ) {
	if ( $ENV{'request.course.id'} ) {
	my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);
	} else {
	$result='<table bgcolor="#E1E1E1" border="2"><tr><td>';
	}
	}
	return $result;
	}

	sub end_standalone {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result='';
	if ($target eq 'web' ) {
	if ( $ENV{'request.course.id'} ) {
	} else {
	$result='</td></tr></table>';
	}
	}
	return $result;
	}

	sub start_comment {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result='';
	if ($target eq 'edit') {
	$result=&Apache::edit::tag_start($target,$token);
	my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]);
	$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4)
	} elsif ( $target eq 'modified') {
	$result=$token->[4].&Apache::edit::modifiedfield($token);
	} elsif ( $target eq 'web' \|\| $target eq 'tex' \|\|
	$target eq 'grade' \|\| $target eq 'answer' \|\| $target eq 'meta') {
	#normally throw away comments
	my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]);
	}
	return $result;
	}

	sub end_comment {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
	if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
	return '';
	}


sub xmlparse {	sub xmlparse {
my ($string) = @_;	my ($string) = @_;
&Apache::lonxml::debug("Got $string");	&Apache::lonxml::debug("Got $string");

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

Removed from v.1.55
changed lines
	Added in v.1.77