--- loncom/xml/lonxml.pm 2000/06/26 21:35:20 1.3
+++ loncom/xml/lonxml.pm 2000/06/29 18:52:54 1.7
@@ -3,14 +3,27 @@
#
# last modified 06/26/00 by Alexander Sakharuk
-package Apache::lonxmlparser;
+package Apache::lonxml;
use strict;
use HTML::TokeParser;
use Safe;
-use Apache::lonstyleparser;
+
+sub register {
+ my $space;
+ my @taglist;
+ my $temptag;
+ ($space,@taglist) = @_;
+ foreach $temptag (@taglist) {
+ $Apache::lonxml::alltags{$temptag}=$space;
+ }
+}
+
+use Apache::style;
use Apache::lontexconvert;
-use Apache::londefaulttags;
+use Apache::run;
+use Apache::londefdef;
+use Apache::scripttag;
#================================================== Main subroutine: xmlparse
sub xmlparse {
@@ -21,9 +34,8 @@ sub xmlparse {
my $finaloutput = '';
my $newarg = '';
my $tempostring = '';
- my $tempocont = '';
my $safeeval = new Safe;
-
+ $safeeval->permit("entereval");
#-------------------- Redefinition of the target in the case of compound target
($target, my @tenta) = split('&&',$target);
@@ -36,101 +48,62 @@ sub xmlparse {
#------------------------------------- Parse input string (content_file_string)
my $token;
-
+
while ($token = $pars->get_token) {
- if ($token->[0] eq 'T') {
- $finaloutput .= $token->[1];
- $tempocont .= $token->[1];
- } elsif ($token->[0] eq 'S') {
-#------------------------------------------------------------- add tag to stack
- push (@stack,$token->[1]);
-#----------------------------------------- add parameters list to another stack
- map {$tempostring .= "$_=$token->[2]->{$_},"} @{$token->[3]};
- push (@parstack,$tempostring);
- $tempostring = '';
-
- if (exists $style_for_target{$token->[1]}) {
-
-#---------------------------------------------------- use style file definition
-
- $newarg = $style_for_target{$token->[1]};
-
- if (index($newarg,'script') != -1 ) {
- my $pat = HTML::TokeParser->new(\$newarg);
- my $tokenpat;
- my $partstring = '';
- my $oustring = '';
- my $outputstring;
-
+ if ($token->[0] eq 'T') {
+ $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');
+ } elsif ($token->[0] eq 'S') {
+ # add tag to stack
+ push (@stack,$token->[1]);
+ # add parameters list to another stack
+ map {$tempostring .= "my \$$_=\"$token->[2]->{$_}\";"} @{$token->[3]};
+ push (@parstack,$tempostring);
+ $tempostring = '';
+
+ if (exists $style_for_target{$token->[1]}) {
+ #print "Style for $token->[1] is " .$style_for_target{$token->[1]}."\n";
+ # use style file definition
+
+ $newarg = $style_for_target{$token->[1]};
+
+ my $pat = HTML::TokeParser->new(\$newarg);
+ my $tokenpat = '';
+ my $partstring = '';
+ my $oustring = '';
+ my $outputstring;
+
while ($tokenpat = $pat->get_token) {
- if ($tokenpat->[0] eq 'T') {
- $oustring .= $tokenpat->[1];
- } elsif ($tokenpat->[0] eq 'S') {
- if ($tokenpat->[1] eq 'script') {
- while ($tokenpat = $pat->get_token and $tokenpat->[1] ne 'script') {
- if ($tokenpat->[0] eq 'S') {
- $partstring .= $tokenpat->[4];
- } elsif ($tokenpat->[0] eq 'T') {
- $partstring .= $tokenpat->[1];
- } elsif ($tokenpat->[0] eq 'E') {
- $partstring .= $tokenpat->[2];
- }
- }
-
- map {$partstring =~ s/\$$_/$token->[2]->{$_}/g; } @{$token->[3]};
-
- &run($partstring,$safeeval);
-
- $partstring = '';
- } elsif ($tokenpat->[1] eq 'evaluate') {
- $outputstring = &evaluate($tokenpat->[2]{expression},$safeeval);
- $oustring .= $outputstring;
- } else {
- $oustring .= $tokenpat->[4];
- }
- } elsif ($tokenpat->[0] eq 'E' and $tokenpat->[1] ne 'evaluate') {
- $oustring .= $tokenpat->[1];
- }
- }
- $newarg = $oustring;
- } else {
- map {$newarg =~ s/\$$_/$token->[2]->{$_}/g; } @{$token->[3]};
- }
- $finaloutput .= $newarg;
- } else {
-#------------------------------------------------ use default definition of tag
- my $sub="start_$token->[1]";
- {
- no strict 'refs';
- if (defined (&$sub)) {
- $currentstring = &$sub($target,$token,\@parstack);
- $finaloutput .= $currentstring;
- $currentstring = '';
- } else {
- $finaloutput .= $token->[4];
+ if ($tokenpat->[0] eq 'T') {
+ $partstring = $tokenpat->[1];
+ } elsif ($tokenpat->[0] eq 'S') {
+ my $sub="start_$tokenpat->[1]";
+ $partstring = &callsub($sub, $target, $tokenpat, \@parstack)
+ } elsif ($tokenpat->[0] eq 'E') {
+ my $sub="end_$tokenpat->[1]";
+ $partstring = &callsub($sub, $target, $tokenpat, \@parstack)
}
- use strict 'refs';
- }
- }
- } elsif ($token->[0] eq 'E') {
-# Put here check for correct final tag (to avoid existence of starting tag only)
-
+ # generate the my mechanism
+ # map {$partstring =~ s/\$$_/$token->[2]->{$_}/g; } @{$token->[3]};
+ print "Temp: $parstack[$#parstack]\n";
+ $oustring .= &Apache::run::evaluate($partstring,$safeeval,$parstack[$#parstack]);
+ }
+ $finaloutput .= $oustring;
+ } else {
+ my $sub="start_$token->[1]";
+ #print "use default definition of tag $sub\n";
+ my $result = &callsub($sub, $target, $token, \@parstack);
+ $finaloutput .= &Apache::run::evaluate($result,$safeeval,$parstack[$#parstack]);
+ }
+ } elsif ($token->[0] eq 'E') {
+ # Put here check for correct final tag (to avoid existence of
+ # starting tag only)
+
pop @stack;
unless (exists $style_for_target{$token->[1]}) {
- my $sub="end_$token->[1]";
- {
- no strict 'refs';
- if (defined (&$sub)) {
- $currentstring = &$sub($target,$token,\@parstack);
- $finaloutput .= $currentstring;
- $currentstring = '';
- } else {
- $finaloutput .= $token->[4];
- }
- use strict 'refs';
- }
+ my $sub="end_$token->[1]";
+ $finaloutput .= callsub($sub, $target, $token, \@parstack);
}
-#-------------------------------------------------- end tag from the style file
+ #---- end tag from the style file
if (exists $style_for_target{'/'."$token->[1]"}) {
$newarg = $style_for_target{'/'."$token->[1]"};
if (index($newarg,'script') != -1 ) {
@@ -139,55 +112,78 @@ sub xmlparse {
my $partstring = '';
my $oustring = '';
my $outputstring;
-
+
while ($tokenpat = $pat->get_token) {
- if ($tokenpat->[0] eq 'T') {
- $oustring .= $tokenpat->[1];
- } elsif ($tokenpat->[0] eq 'S') {
+ if ($tokenpat->[0] eq 'T') {
+ $oustring .= $tokenpat->[1];
+ } elsif ($tokenpat->[0] eq 'S') {
if ($tokenpat->[1] eq 'script') {
while ($tokenpat = $pat->get_token and $tokenpat->[1] ne 'script') {
- if ($tokenpat->[0] eq 'S') {
- $partstring .= $tokenpat->[4];
- } elsif ($tokenpat->[0] eq 'T') {
- $partstring .= $tokenpat->[1];
- } elsif ($tokenpat->[0] eq 'E') {
- $partstring .= $tokenpat->[2];
- }
+ if ($tokenpat->[0] eq 'S') {
+
+ $partstring .= $tokenpat->[4];
+ } elsif ($tokenpat->[0] eq 'T') {
+ $partstring .= $tokenpat->[1];
+ } elsif ($tokenpat->[0] eq 'E') {
+ $partstring .= $tokenpat->[2];
+ }
}
-
+
my @tempor_list = split(',',$parstack[$#parstack]);
my @te_kl = ();
my %tempor_hash = ();
map {(my $onete,my $twote) = split('=',$_); push (@te_kl,$onete);
$tempor_hash{$onete} = $twote} @tempor_list;
map {$partstring =~ s/\$$_/$tempor_hash{$_}/g; } @te_kl;
-
- &run($partstring,$safeeval);
-
+ print "want to use run\n";
+ &Apache::run::run($partstring,$safeeval);
+
$partstring = '';
} elsif ($tokenpat->[1] eq 'evaluate') {
- $outputstring = &evaluate($tokenpat->[2]{expression},$safeeval);
- $oustring .= $outputstring;
+ $outputstring = &Apache::run::evaluate($tokenpat->[2]{expression},$safeeval);
+ $oustring .= $outputstring;
} else {
- $oustring .= $tokenpat->[4];
+ $oustring .= $tokenpat->[4];
}
- } elsif ($tokenpat->[0] eq 'E' and $tokenpat->[1] ne 'evaluate') {
+ } elsif ($tokenpat->[0] eq 'E' and $tokenpat->[1] ne 'evaluate') {
$oustring .= $tokenpat->[1];
- }
+ }
}
- $newarg = $oustring;
+ $newarg = $oustring;
} else {
- my @very_temp = split(',',@parstack[$#parstack]);
+ my @very_temp = split(',',$parstack[$#parstack]);
map {my @ret= split('=',$_); $newarg =~ s/\$$ret[0]/$ret[1]/g; } @very_temp;
}
-
+
$finaloutput .= $newarg;
}
pop @parstack;
- }
+ }
}
return $finaloutput;
}
+sub callsub {
+ my ($sub,$target,$token,@parstack)=@_;
+ my $currentstring='';
+ {
+ no strict 'refs';
+ if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
+ #print "Calling sub $sub in $space \n";
+ $sub="$space\:\:$sub";
+ $currentstring = &$sub($target,$token,\@parstack);
+ } else {
+ #print "NOT Calling sub $sub\n";
+ if (defined($token->[4])) {
+ $currentstring = $token->[4];
+ } else {
+ $currentstring = $token->[2];
+ }
+ }
+ use strict 'refs';
+ }
+ return $currentstring;
+}
+
1;
__END__