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.12 and 1.17

version 1.12, 2000/08/11 15:27:58	version 1.17, 2000/10/02 22:22:25
Line 14 sub BEGIN {	Line 14 sub BEGIN {

sub start_script {	sub start_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$parstack,$parser,$safeeval)=@_;
	my $args ='';
	if ( $#$parstack > -1 ) {
	$args=$$parstack[$#$parstack];
	}
	my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
	&Apache::lonxml::debug("found type of $type");
my $result="";	my $result="";
my $bodytext=$$parser[$#$parser]->get_text("/script");	if ($type eq "loncapa/perl") {
if ($target ne "edit" ) {	$safeeval->share('$Apache::scripttag::start_script::result');
$result = &Apache::run::run($bodytext,$safeeval);	# my $bodytext=$$parser[$#$parser]->get_text("/script");
	my $bodytext=&Apache::lonxml::get_all_text("script",$$parser[$#$parser]);

	if ( $target eq "modified" ) {

	}

	# print "<br> script runs $bodytext</br>";
	&Apache::run::run($bodytext,$safeeval);

	if ($target eq "edit" ) {
	$result= "<br> <$token->[1]> output: <br>$bodytext<br>Source:<br>";
	$result.=&editfield($token->[1],$bodytext);
	}
} else {	} else {
$result=&editfield($token->[1],$bodytext);	$result = $token->[4];
}	}
return $result;
}	}

sub end_script {}	sub end_script {
	my ($target,$token,$parstack,$parser,$safeeval)=@_;
	return $token->[2];
	}

sub start_scriptlib {	sub start_scriptlib {
my ($target,$token,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$parstack,$parser,$safeeval)=@_;
my $bodytext=$$parser[$#$parser]->get_text("/scriptlib");	my $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
my $result ="";	my $result ="";
if ($target ne "edit" ) {
$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);	$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
&Apache::run::run(&getfile($bodytext),$safeeval);	&Apache::run::run(&getfile($bodytext),$safeeval);
#print "ran $bodytext:<br>".&getfile($bodytext)."<br>";	#print "ran $bodytext:<br>".&getfile($bodytext)."<br>";
} else {
$result=&editfield($token->[1],$bodytext);	if ($target eq "edit" ) {
	$result.=&editfield($token->[1],$bodytext);
}	}
return $result;	return $result;
}	}
Line 46 sub start_parserlib {	Line 68 sub start_parserlib {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $bodytext=$$parser[$#$parser]->get_text("/parserlib");	my $bodytext=$$parser[$#$parser]->get_text("/parserlib");
my $result ="";	my $result ="";
if ($target ne "edit" ) {
$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);	$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
%$style = ( %$style , &Apache::style::styleparser($target,	%$style = ( %$style , &Apache::style::styleparser($target,
&getfile($bodytext)));	&getfile($bodytext)));
} else {
	if ($target eq "edit" ) {
$result=&editfield($token->[1],$bodytext);	$result=&editfield($token->[1],$bodytext);
}	}
return $result;	return $result;
Line 63 sub start_import {	Line 86 sub start_import {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $bodytext=$$parser[$#$parser]->get_text("/import");	my $bodytext=$$parser[$#$parser]->get_text("/import");
my $result ="";	my $result ="";
if ($target ne "edit" ) {
$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);	$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
my $file=&getfile($bodytext);	my $file=&getfile($bodytext);
my $tempparser=HTML::TokeParser->new(\$file);	if ($file eq -1) {
push (@$parser,$tempparser);	return "<b> Unable to find <i>$bodytext</i> for import</b>";
} else {	}
$result=&editfield($token->[1],$bodytext);
	my $tempparser=HTML::TokeParser->new(\$file);
	push (@$parser,$tempparser);

	if ($target eq "edit" ) {
	$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>"
}	}
}	}
Line 99 sub getfile {	Line 127 sub getfile {
&Apache::lonnet::subscribe($filename);	&Apache::lonnet::subscribe($filename);
&Apache::lonnet::repcopy($filename);	&Apache::lonnet::repcopy($filename);
}	}
	if (! -e $filename ) { return -1; };
my $fh=Apache::File->new($filename);	my $fh=Apache::File->new($filename);
while (<$fh>) {	while (<$fh>) {
$a .=$_;	$a .=$_;

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

Removed from v.1.12
changed lines
	Added in v.1.17