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.22 and 1.23

version 1.22, 2000/10/02 22:19:19	version 1.23, 2000/10/05 19:30:14
Line 26 use Apache::run;	Line 26 use Apache::run;
use Apache::londefdef;	use Apache::londefdef;
use Apache::scripttag;	use Apache::scripttag;
#================================================== Main subroutine: xmlparse	#================================================== Main subroutine: xmlparse
	@Apache::lonxml::pwd=();
sub xmlparse {	sub xmlparse {

my ($target,$content_file_string,$safeinit,%style_for_target) = @_;	my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
my @pars = ();	my @pars = ();
push (@pars,HTML::TokeParser->new(\$content_file_string));	@Apache::lonxml::pwd=();
	my $pwd=$ENV{'request.filename'};
	$pwd =~ s:/[^/]*$::;
	&newparser(\@pars,\$content_file_string,$pwd);
my $currentstring = '';	my $currentstring = '';
my $finaloutput = '';	my $finaloutput = '';
my $newarg = '';	my $newarg = '';
Line 97 sub xmlparse {	Line 100 sub xmlparse {
if ($token->[0] eq 'E') { pop @stack;pop @parstack;&decreasedepth($token);}	if ($token->[0] eq 'E') { pop @stack;pop @parstack;&decreasedepth($token);}
}	}
pop @pars;	pop @pars;
	pop @Apache::lonxml::pwd;
}	}
return $finaloutput;	return $finaloutput;
}	}
Line 107 sub recurse {	Line 111 sub recurse {
my @innerparstack = ();	my @innerparstack = ();
my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;	my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;
my @pat = ();	my @pat = ();
push (@pat,HTML::TokeParser->new(\$newarg));	&newparser(\@pat,\$newarg);
my $tokenpat;	my $tokenpat;
my $partstring = '';	my $partstring = '';
my $output='';	my $output='';
Line 155 sub recurse {	Line 159 sub recurse {
&decreasedepth($tokenpat);}	&decreasedepth($tokenpat);}
}	}
pop @pat;	pop @pat;
	pop @Apache::lonxml::pwd;
}	}
return $output;	return $output;
}	}
Line 165 sub callsub {	Line 170 sub callsub {
{	{
no strict 'refs';	no strict 'refs';
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<br>\n");
$sub="$space\:\:$sub";	$sub="$space\:\:$sub";
$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);	$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
$currentstring = &$sub($target,$token,$parstack,$parser,	$currentstring = &$sub($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<br>\n");
if (defined($token->[4])) {	if (defined($token->[4])) {
$currentstring = $token->[4];	$currentstring = $token->[4];
} else {	} else {
Line 230 sub get_all_text {	Line 235 sub get_all_text {
return $result	return $result
}	}

	sub newparser {
	my ($parser,$contentref,$dir) = @_;
	push (@$parser,HTML::TokeParser->new($contentref));
	if ( $dir eq '' ) {
	push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
	} else {
	push (@Apache::lonxml::pwd, $dir);
	}
	# &Apache::lonxml::debug("pwd:$#Apache::lonxml::pwd");
	# &Apache::lonxml::debug("pwd:$Apache::lonxml::pwd[$#Apache::lonxml::pwd]");
	}

sub parstring {	sub parstring {
my ($token) = @_;	my ($token) = @_;
Line 249 sub debug {	Line 265 sub debug {
}	}
}	}
sub error {	sub error {
if ($Apache::lonxml::debug eq 1) {	print "ERROR:".$_[0]."<br>\n";
print "ERROR:".$_[0]."<br>\n";
}
}	}
sub warning {	sub warning {
if ($Apache::lonxml::debug eq 1) {	if ($Apache::lonxml::debug eq 1) {

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

Removed from v.1.22
changed lines
	Added in v.1.23