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.50 and 1.53

version 1.50, 2001/08/20 17:14:55	version 1.53, 2001/10/05 22:29:10
Line 31 sub start_script {	Line 31 sub start_script {
my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);	my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
if ( $target eq "modified" ) {	if ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield();	$result=$token->[4].&Apache::edit::modifiedfield();
} elsif ( $target eq "web" \|\| $target eq "grade" ) {	} elsif ( $target eq "web" \|\| $target eq "grade" \|\| $target eq 'answer') {
&Apache::run::run($bodytext,$safeeval);	&Apache::run::run($bodytext,$safeeval);
	if (($ENV{'request.state'} eq 'construct') && ($target eq 'web')) {
	$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>";
	my $listing= &Apache::run::dump($target,$safeeval);
	$listing =~ s/\n/\\n/g;
	$result.=$listing;
	$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a>";
	}
} elsif ($target eq "edit" ) {	} elsif ($target eq "edit" ) {
#&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 />";
Line 51 sub end_script {	Line 59 sub end_script {
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);	my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
my $result='';	my $result='';
#other script blocks need to survive	#other script blocks need to survive
if ($type ne "loncapa/perl") { return $token->[2]; }	if ($type ne "loncapa/perl") {
if ($target eq 'edit' ) { return &Apache::edit::end_table(); }	return $token->[2];
	} elsif ($target eq 'edit' ) {
	return &Apache::edit::end_table();
	} elsif (($ENV{'request.state'} eq 'construct') && ($target eq 'web')) {
	$Apache::lonxml::evaluate++;
	}
return '';	return '';
}	}

Line 64 sub start_display {	Line 77 sub start_display {

if ( $target eq "modified" ) {	if ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield();	$result=$token->[4].&Apache::edit::modifiedfield();
} elsif ( $target eq "web" \|\| $target eq "grade" ) {	} elsif ( $target eq "web" \|\| $target eq "grade" \|\| $target eq 'answer') {
$result=&Apache::run::run($bodytext,$safeeval);	$result=&Apache::run::run($bodytext,$safeeval);
if ($target eq 'grade' ) {	if ($target eq 'grade' ) {
$result=''; # grade should produce no output	$result=''; # grade should produce no output
Line 91 sub start_scriptlib {	Line 104 sub start_scriptlib {
my $result ='';	my $result ='';
my $error='';	my $error='';

if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'meta' \|\| $target eq 'edit') {	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'meta' \|\| $target eq 'edit' \|\| $target eq 'answer') {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");	$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,	$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);	$$parstack[$#$parstack]);
Line 136 sub start_parserlib {	Line 149 sub start_parserlib {
my $bodytext;	my $bodytext;
my $result ="";	my $result ="";
my $error='';	my $error='';
if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'meta' \|\| $target eq 'edit') {	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'meta' \|\| $target eq 'edit' \|\| $target eq 'answer') {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");	$bodytext=$$parser[$#$parser]->get_text("/parserlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,	$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);	$$parstack[$#$parstack]);
Line 209 sub start_import {	Line 222 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') {	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer') {
# 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 255 sub end_storetc {	Line 268 sub end_storetc {
my $result;	my $result;
my $output=&Apache::lonxml::endredirection;	my $output=&Apache::lonxml::endredirection;
$output =~ s/\"/\&quot\;/g;	$output =~ s/\"/\&quot\;/g;
$result = "{\bf $output.}}\write\tcfile{\protect\tcpc{ $output.}{\the\value{relpage}}}";	$result = '{\bf '.$output.'.}}\write\tcfile{\protect\tcpc{ '.$output.'.}{\the\value{relpage}}}';
return $result;	return $result;
}	}

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

Removed from v.1.50
changed lines
	Added in v.1.53