version 1.48, 2001/01/12 20:38:05
|
version 1.49, 2001/01/30 21:01:36
|
Line 31 sub printalltags {
|
Line 31 sub printalltags {
|
&Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}"); |
&Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}"); |
} |
} |
} |
} |
|
|
use Apache::style; |
use Apache::style; |
use Apache::lontexconvert; |
use Apache::lontexconvert; |
use Apache::run; |
use Apache::run; |
Line 121 sub xmlparse {
|
Line 120 sub xmlparse {
|
#clear out any tags that didn't end |
#clear out any tags that didn't end |
while ($token->[1] ne $stack[$#stack] |
while ($token->[1] ne $stack[$#stack] |
&& ($#stack > -1)) { |
&& ($#stack > -1)) { |
&Apache::lonxml::error("Unbalanced tags in resource $stack['-1']"); |
&Apache::lonxml::warning("Unbalanced tags in resource $stack['-1']"); |
pop @stack;pop @parstack;&decreasedepth($token); |
pop @stack;pop @parstack;&decreasedepth($token); |
} |
} |
|
|
Line 195 sub recurse {
|
Line 194 sub recurse {
|
#clear out any tags that didn't end |
#clear out any tags that didn't end |
while ($tokenpat->[1] ne $innerstack[$#innerstack] |
while ($tokenpat->[1] ne $innerstack[$#innerstack] |
&& ($#innerstack > -1)) { |
&& ($#innerstack > -1)) { |
&Apache::lonxml::error("Unbalanced tags in resource $innerstack['-1']"); |
&Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']"); |
pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat); |
pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat); |
} |
} |
$partstring = &callsub("end_$tokenpat->[1]", |
$partstring = &callsub("end_$tokenpat->[1]", |
Line 281 sub decreasedepth {
|
Line 280 sub decreasedepth {
|
$Apache::lonxml::olddepth=$Apache::lonxml::depth+1; |
$Apache::lonxml::olddepth=$Apache::lonxml::depth+1; |
} |
} |
if ( $Apache::lonxml::depth < -1) { |
if ( $Apache::lonxml::depth < -1) { |
&Apache::lonxml::error("Unbalanced tags in resource"); |
&Apache::lonxml::warning("Unbalanced tags in resource"); |
$Apache::lonxml::depth='-1'; |
$Apache::lonxml::depth='-1'; |
} |
} |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
Line 296 sub get_all_text {
|
Line 295 sub get_all_text {
|
my $token; |
my $token; |
my $result=''; |
my $result=''; |
my $tag=substr($tag,1); #strip the / off the tag |
my $tag=substr($tag,1); #strip the / off the tag |
# &Apache::lonxml::debug("have:$tag:"); |
#&Apache::lonxml::debug("have:$tag:"); |
while (($depth >=0) && ($token = $pars->get_token)) { |
while (($depth >=0) && ($token = $pars->get_token)) { |
|
#&Apache::lonxml::debug("token:$token->[0]:$depth:$token->[1]"); |
if ($token->[0] eq 'T') { |
if ($token->[0] eq 'T') { |
$result.=$token->[1]; |
$result.=$token->[1]; |
} elsif ($token->[0] eq 'S') { |
} elsif ($token->[0] eq 'S') { |
Line 311 sub get_all_text {
|
Line 311 sub get_all_text {
|
} |
} |
} |
} |
} |
} |
|
# &Apache::lonxml::debug("Exit:$result:"); |
return $result |
return $result |
} |
} |
|
|
Line 395 sub debug {
|
Line 396 sub debug {
|
print "DEBUG:".$_[0]."<br>\n"; |
print "DEBUG:".$_[0]."<br>\n"; |
} |
} |
} |
} |
|
|
sub error { |
sub error { |
# 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) { |
print "WARNING:".$_[0]."<br>\n"; |
print "WARNING:".$_[0]."<br>\n"; |