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.85 and 1.89

version 1.85, 2003/02/07 22:03:21	version 1.89, 2003/05/22 21:05:01
Line 44 BEGIN {	Line 44 BEGIN {
('script','scriptlib','parserlib','import',	('script','scriptlib','parserlib','import',
'window','display','storetc','physnet',	'window','display','storetc','physnet',
'standalone','comment',	'standalone','comment',
'LONCAPA_INTERNAL_TURN_STYLE_ON'));	'LONCAPA_INTERNAL_TURN_STYLE_ON',
	'LONCAPA_INTERNAL_LONHTTPD_PORT'));
}	}

sub start_LONCAPA_INTERNAL_TURN_STYLE_ON {	sub start_LONCAPA_INTERNAL_TURN_STYLE_ON {
$Apache::lonxml::usestyle=1;	$Apache::lonxml::usestyle=1;
	$Apache::lonxml::style_values='';
return ('','no');	return ('','no');
}	}

Line 56 sub end_LONCAPA_INTERNAL_TURN_STYLE_ON {	Line 58 sub end_LONCAPA_INTERNAL_TURN_STYLE_ON {
return ('','no');	return ('','no');
}	}

	sub start_LONCAPA_INTERNAL_LONHTTPD_PORT {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
	if ($target eq 'web') {
	my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
	if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
	return '<script type="text/javascript">var lonhttpdport=\''.
	$lonhttpdPort.'\';</script>';
	}
	return ('','no');
	}

	sub end_LONCAPA_INTERNAL_LONHTTPD_PORT {
	return ('','no');
	}

sub start_script {	sub start_script {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@Apache::scripttag::parser_env = @_;	@Apache::scripttag::parser_env = @_;
Line 73 sub start_script {	Line 90 sub start_script {
&Apache::lonxml::default_homework_load($safeeval);	&Apache::lonxml::default_homework_load($safeeval);
}	}
&Apache::run::run($bodytext,$safeeval);	&Apache::run::run($bodytext,$safeeval);
if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {	if (($target eq 'answer') &&
	($ENV{'form.answer_output_mode'} ne 'tex') &&
	($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= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));	my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
Line 292 sub start_import {	Line 311 sub start_import {
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);	my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if (!$id) { $id=$Apache::lonxml::curdepth; }	if (!$id) { $id=$Apache::lonxml::curdepth; }
push(@Apache::inputtags::import,$id);	push(@Apache::inputtags::import,$id);
&Apache::lonxml::newparser($parser,\$file,$dir);
	&Apache::lonxml::newparser($parser,\$file,$dir);

} elsif ($target eq "edit" ) {	} elsif ($target eq "edit" ) {
$result.=&Apache::edit::tag_start($target,$token);	$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::editline($token->[1],$bodytext,'',40);	$result.=&Apache::edit::editline($token->[1],$bodytext,'',40);
Line 411 sub end_comment {	Line 432 sub end_comment {

sub xmlparse {	sub xmlparse {
my ($string) = @_;	my ($string) = @_;
&Apache::lonxml::debug("Got $string");	# &Apache::lonxml::debug("Got $string");
my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=	my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
@Apache::scripttag::parser_env;	@Apache::scripttag::parser_env;
my @parser;	my @parser;

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

Removed from v.1.85
changed lines
	Added in v.1.89