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.25 and 1.29

version 1.25, 2000/11/22 21:13:35	version 1.29, 2001/01/04 19:15:02
Line 16 sub BEGIN {	Line 16 sub BEGIN {
sub start_script {	sub start_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$parstack,$parser,$safeeval)=@_;
my $args ='';	my $args ='';
if ( $#$parstack > -1 ) {	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
$args=$$parstack[$#$parstack];
}
my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);	my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
my $result='';	my $result='';
#&Apache::lonxml::debug("found type of $type");	#&Apache::lonxml::debug("found type of $type");
Line 26 sub start_script {	Line 24 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" ) {
}
&Apache::run::run($bodytext,$safeeval);	} elsif ( $target eq "web" \|\| $target eq "grade" ) {
	&Apache::run::run($bodytext,$safeeval);
if ($target eq "edit" ) {	} elsif ($target eq "edit" ) {
	&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.=&editfield($token->[1],$bodytext);	$result.=&editfield($token->[1],$bodytext);
}	}
} else {	} else {
$result = $token->[4];	if ($target ne "meta") { $result = $token->[4]; }
}	}
return $result;	return $result;
}	}

sub end_script {	sub end_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$parstack,$parser,$safeeval)=@_;
# return '';	if ( $target eq "meta" ) { return ''; }
return $token->[2];	my $args ='';
	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
	my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
	my $result='';
	#other script blocks need to survive
	if ($type ne "loncapa/perl") { return $token->[2]; }
	return '';
}	}

sub start_display {	sub start_display {
Line 56 sub start_display {	Line 61 sub start_display {
if ( $target eq "modified" ) {	if ( $target eq "modified" ) {
}	}
my $result=&Apache::run::run($bodytext,$safeeval);	my $result=&Apache::run::run($bodytext,$safeeval);
	if ($target eq 'grade' ) {
	# grade should produce no output
	$result='';
	}
if ($target eq "edit" ) {	if ($target eq "edit" ) {
$result =	$result =
"<br> <$token->[1]> output: <br>$bodytext<br>Source:<br>";	"<br> <$token->[1]> output: <br>$bodytext<br>Source:<br>";
Line 103 sub start_parserlib {	Line 111 sub start_parserlib {
my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],	my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
$bodytext);	$bodytext);
my $styletext=&Apache::lonnet::getfile($location);	my $styletext=&Apache::lonnet::getfile($location);
	#&Apache::lonxml::debug("found :$bodytext: in :$location: with :$styletext:");
if ($styletext == -1) {	if ($styletext == -1) {
&Apache::lonxml::error("<b> Unable to find <i>$location</i> for parserlib</b>");	&Apache::lonxml::error("<b> Unable to find <i>$location</i> for parserlib</b>");
return "";	return "";
Line 155 sub start_import {	Line 164 sub start_import {
$result.=&editfield($token->[1],$bodytext);	$result.=&editfield($token->[1],$bodytext);
$result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br></br>"	$result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br></br>"
}	}
	return '';
}	}

sub end_import {	sub end_import {

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

Removed from v.1.25
changed lines
	Added in v.1.29