loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.60 and 1.65

version 1.60, 2001/03/23 22:08:05	version 1.65, 2001/03/27 18:19:29
Line 97 sub xmlparse {	Line 97 sub xmlparse {
while ( $#pars > -1 ) {	while ( $#pars > -1 ) {
while ($token = $pars[$#pars]->get_token) {	while ($token = $pars[$#pars]->get_token) {
if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') \|\| ($token->[0] eq 'D') ) {	if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') \|\| ($token->[0] eq 'D') ) {
if (!$metamode) { $result=$token->[1]; }	if ($metamode<1) { $result=$token->[1]; }
} elsif ($token->[0] eq 'PI') {	} elsif ($token->[0] eq 'PI') {
if (!$metamode) { $result=$token->[2]; }	if ($metamode<1) { $result=$token->[2]; }
} elsif ($token->[0] eq 'S') {	} elsif ($token->[0] eq 'S') {
# add tag to stack	# add tag to stack
push (@stack,$token->[1]);	push (@stack,$token->[1]);
Line 107 sub xmlparse {	Line 107 sub xmlparse {
push (@parstack,&parstring($token));	push (@parstack,&parstring($token));
&increasedepth($token);	&increasedepth($token);
if (exists $style_for_target{$token->[1]}) {	if (exists $style_for_target{$token->[1]}) {
if ($metamode) {	if ($Apache::lonxml::redirection) {
$result = $style_for_target{$token->[1]};
} elsif ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .=	$Apache::lonxml::outputstack['-1'] .=
&recurse($style_for_target{$token->[1]},$target,$safeeval,	&recurse($style_for_target{$token->[1]},$target,$safeeval,
\%style_for_target,@parstack);	\%style_for_target,@parstack);
Line 129 sub xmlparse {	Line 127 sub xmlparse {
}	}

if (exists $style_for_target{'/'."$token->[1]"}) {	if (exists $style_for_target{'/'."$token->[1]"}) {
if ($metamode) {	if ($Apache::lonxml::redirection) {
$result = $style_for_target{$token->[1]};
} elsif ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .=	$Apache::lonxml::outputstack['-1'] .=
&recurse($style_for_target{'/'."$token->[1]"},	&recurse($style_for_target{'/'."$token->[1]"},
$target,$safeeval,\%style_for_target,@parstack);	$target,$safeeval,\%style_for_target,@parstack);
Line 191 sub recurse {	Line 187 sub recurse {
while ( $#pat > -1 ) {	while ( $#pat > -1 ) {
while ($tokenpat = $pat[$#pat]->get_token) {	while ($tokenpat = $pat[$#pat]->get_token) {
if (($tokenpat->[0] eq 'T') \|\| ($tokenpat->[0] eq 'C') \|\| ($tokenpat->[0] eq 'D') ) {	if (($tokenpat->[0] eq 'T') \|\| ($tokenpat->[0] eq 'C') \|\| ($tokenpat->[0] eq 'D') ) {
$partstring = $tokenpat->[1];	if ($metamode<1) { $partstring=$tokenpat->[1]; }
} elsif ($tokenpat->[0] eq 'PI') {	} elsif ($tokenpat->[0] eq 'PI') {
$partstring = $tokenpat->[2];	if ($metamode<1) { $partstring=$tokenpat->[2]; }
} elsif ($tokenpat->[0] eq 'S') {	} elsif ($tokenpat->[0] eq 'S') {
push (@innerstack,$tokenpat->[1]);	push (@innerstack,$tokenpat->[1]);
push (@innerparstack,&parstring($tokenpat));	push (@innerparstack,&parstring($tokenpat));
Line 253 sub callsub {	Line 249 sub callsub {
$safeeval,$style);	$safeeval,$style);
}	}
if (my $space=$Apache::lonxml::alltags{$token->[1]}) {	if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
#&Apache::lonxml::debug("Calling sub $sub in $space<br />\n");	# &Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
$sub1="$space\:\:$sub";	$sub1="$space\:\:$sub";
$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);	$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
$currentstring .= &$sub1($target,$token,$parstack,$parser,	$currentstring .= &$sub1($target,$token,$parstack,$parser,
$safeeval,$style);	$safeeval,$style);
} else {	} else {
#&Apache::lonxml::debug("NOT Calling sub $sub in $space<br />\n");	# &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
if (defined($token->[4]) && !$metamode) {	if ($metamode <1) {
$currentstring .= $token->[4];	if (defined($token->[4]) && ($metamode < 1)) {
} else {	$currentstring .= $token->[4];
$currentstring .= $token->[2];	} else {
	$currentstring .= $token->[2];
	}
}	}
}	}
if ($target eq 'edit' && $token->[0] eq 'E') {	if ($target eq 'edit' && $token->[0] eq 'E') {
$currentstring = &Apache::edit::tag_end($target,$token,$parstack,$parser,	$currentstring .= &Apache::edit::tag_end($target,$token,$parstack,$parser,
$safeeval,$style);	$safeeval,$style);
}	}
use strict 'refs';	use strict 'refs';
Line 419 sub handler {	Line 417 sub handler {
} else {	} else {
$request->content_type('text/html');	$request->content_type('text/html');
}	}

# $request->print(<<ENDHEADER);	# $request->print(<<ENDHEADER);
#<html>	#<html>
#<head>	#<head>
Line 429 sub handler {	Line 427 sub handler {
#ENDHEADER	#ENDHEADER
# &Apache::lonhomework::send_header($request);	# &Apache::lonhomework::send_header($request);
$request->send_http_header;	$request->send_http_header;

return OK if $request->header_only;	return OK if $request->header_only;

$request->print(&Apache::lontexconvert::header());	if ($target eq 'web') {
	$request->print(&Apache::lontexconvert::header());
$request->print('<body bgcolor="#FFFFFF">'."\n");	$request->print('<body bgcolor="#FFFFFF">'."\n");
	}

my $file=&Apache::lonnet::filelocation("",$request->uri);	my $file=&Apache::lonnet::filelocation("",$request->uri);
my %mystyle;	my %mystyle;
Line 449 sub handler {	Line 448 sub handler {
$request->print($result);	$request->print($result);


$request->print('</body>');	if ($target eq 'tex') {
$request->print(&Apache::lontexconvert::footer());	# $request->print('\end{document}'."\n");
	} elsif ($target eq 'web') {
	$request->print('</body>');
	$request->print(&Apache::lontexconvert::footer());
	}

writeallows($request->uri);	writeallows($request->uri);
return OK;	return OK;
}	}

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

Removed from v.1.60
changed lines
	Added in v.1.65