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.32

version 1.25, 2000/11/22 21:13:35	version 1.32, 2001/01/12 20:38:06
Line 10 use Apache::lonnet;	Line 10 use Apache::lonnet;
sub BEGIN {	sub BEGIN {
&Apache::lonxml::register('Apache::scripttag',('script','scriptlib',	&Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
'parserlib','import',	'parserlib','import',
'footnote','display'));	'window','display'));
}	}

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" ) {
}	} elsif ( $target eq "web" \|\| $target eq "grade" ) {
&Apache::run::run($bodytext,$safeeval);	&Apache::run::run($bodytext,$safeeval);
	} elsif ($target eq "edit" ) {
if ($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 60 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 110 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 118 sub start_parserlib {	Line 126 sub start_parserlib {
sub end_parserlib {	sub end_parserlib {
}	}

sub start_footnote {	sub start_window {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
$Apache::lonxml::redirection = 0;	if ($target eq 'web') {
	$Apache::lonxml::redirection = 0;
	}
return $result;	return $result;
}	}

sub end_footnote {	sub end_window {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
$Apache::lonxml::outputstack =~ s/\"/\&quot\;/g;	my $result;
my $result = "<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor="#FFFFFF"> $Apache::lonxml::outputstack </body></html>\');newWindow.document.close();void(0);\"><sup>*</sup></a>";	if ($target eq 'web') {
$Apache::lonxml::outputstack = "";	$Apache::lonxml::outputstack =~ s/\"/\&quot\;/g;
$Apache::lonxml::redirection = 1;	$result = "<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor="#FFFFFF"> $Apache::lonxml::outputstack </body></html>\');newWindow.document.close();void(0);\"><sup>*</sup></a>";
	$Apache::lonxml::outputstack = "";
	$Apache::lonxml::redirection = 1;
	} else {
	$result = '';
	}
return $result;	return $result;
}	}

Line 148 sub start_import {	Line 163 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::newparser($parser,\$file,$dir);	&Apache::lonxml::newparser($parser,\$file,$dir);

if ($target eq "edit" ) {	if ($target eq "edit" ) {
$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 {
}	}

	sub start_meta {
	my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
	my $result = '';
	if ($target ne 'meta') {
	$result = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]);
	$result = '';
	return $result;
	} else {
	return $result;
	}
	}

	sub end_meta {
	}

sub editfield {	sub editfield {
my ($tag,$data)=@_;	my ($tag,$data)=@_;

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

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