version 1.316, 2004/04/12 22:55:59
|
version 1.319, 2004/05/27 04:25:13
|
Line 460 sub inner_xmlparse {
|
Line 460 sub inner_xmlparse {
|
#clear out any tags that didn't end |
#clear out any tags that didn't end |
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) { |
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) { |
my $lasttag=$$stack[-1]; |
my $lasttag=$$stack[-1]; |
if ($token->[1] =~ /^$lasttag$/i) { |
if ($token->[1] =~ /^\Q$lasttag\E$/i) { |
&Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>'); |
&Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>'); |
last; |
last; |
} else { |
} else { |
Line 524 sub inner_xmlparse {
|
Line 524 sub inner_xmlparse {
|
return $finaloutput; |
return $finaloutput; |
} |
} |
|
|
|
## |
|
## Looks to see if there is a subroutine defined for this tag. If so, call it, |
|
## otherwise do not call it as we do not know what it is. |
|
## |
sub callsub { |
sub callsub { |
my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $currentstring=''; |
my $currentstring=''; |
Line 556 sub callsub {
|
Line 560 sub callsub {
|
$parstack,$parser,$safeeval, |
$parstack,$parser,$safeeval, |
$style); |
$style); |
} else { |
} else { |
|
if ($target eq 'tex') { |
|
# throw away tag name |
|
return ''; |
|
} |
#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode"); |
#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode"); |
if ($metamode <1) { |
if ($metamode <1) { |
if (defined($token->[4]) && ($metamode < 1)) { |
if (defined($token->[4]) && ($metamode < 1)) { |
Line 735 sub init_safespace {
|
Line 743 sub init_safespace {
|
my $rndseed; |
my $rndseed; |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
$rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name); |
$rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name); |
$safeinit .= ';$external::randomseed='.$rndseed.';'; |
$safeinit .= ';$external::randomseed="'.$rndseed.'";'; |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::run::run($safeinit,$safeeval); |
&Apache::run::run($safeinit,$safeeval); |
|
|
Line 1047 sub afterburn {
|
Line 1055 sub afterburn {
|
my $anchorname=$_; |
my $anchorname=$_; |
my $matchthis=$anchorname; |
my $matchthis=$anchorname; |
$matchthis=~s/\_+/\\s\+/g; |
$matchthis=~s/\_+/\\s\+/g; |
$result=~s/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs; |
$result=~s/(\Q$matchthis\E)/\<font color=\"red\"\>$1\<\/font\>/gs; |
} |
} |
} |
} |
if ($ENV{'form.link'}) { |
if ($ENV{'form.link'}) { |
Line 1055 sub afterburn {
|
Line 1063 sub afterburn {
|
my ($anchorname,$linkurl)=split(/\>/,$_); |
my ($anchorname,$linkurl)=split(/\>/,$_); |
my $matchthis=$anchorname; |
my $matchthis=$anchorname; |
$matchthis=~s/\_+/\\s\+/g; |
$matchthis=~s/\_+/\\s\+/g; |
$result=~s/($matchthis)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs; |
$result=~s/(\Q$matchthis\E)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs; |
} |
} |
} |
} |
if ($ENV{'form.anchor'}) { |
if ($ENV{'form.anchor'}) { |
my $anchorname=$ENV{'form.anchor'}; |
my $anchorname=$ENV{'form.anchor'}; |
my $matchthis=$anchorname; |
my $matchthis=$anchorname; |
$matchthis=~s/\_+/\\s\+/g; |
$matchthis=~s/\_+/\\s\+/g; |
$result=~s/($matchthis)/\<a name=\"$anchorname\"\>$1\<\/a\>/s; |
$result=~s/(\Q$matchthis\E)/\<a name=\"$anchorname\"\>$1\<\/a\>/s; |
$result.=(<<"ENDSCRIPT"); |
$result.=(<<"ENDSCRIPT"); |
<script type="text/javascript"> |
<script type="text/javascript"> |
document.location.hash='$anchorname'; |
document.location.hash='$anchorname'; |