--- loncom/xml/lonxml.pm	2000/07/05 18:04:45	1.9
+++ loncom/xml/lonxml.pm	2000/07/25 21:28:22	1.13
@@ -8,6 +8,7 @@ package Apache::lonxml;
 use strict;
 use HTML::TokeParser;
 use Safe;
+use Opcode;
 
 sub register {
   my $space;
@@ -18,7 +19,7 @@ sub register {
     $Apache::lonxml::alltags{$temptag}=$space;
   }
 }
-
+                                     
 use Apache::style;
 use Apache::lontexconvert;
 use Apache::run;
@@ -35,6 +36,7 @@ sub xmlparse {
  my $newarg = '';
  my $safeeval = new Safe;
  $safeeval->permit("entereval");
+ $safeeval->permit(":base_math");
 #-------------------- Redefinition of the target in the case of compound target
 
  ($target, my @tenta) = split('&&',$target);
@@ -75,24 +77,31 @@ sub xmlparse {
 	   push (@innerstack,$tokenpat->[1]);
 	   push (@innerparstack,&parstring($tokenpat));
 	   $partstring = &callsub("start_$tokenpat->[1]", 
-				  $target, $tokenpat, \@innerparstack)
+				  $target, $tokenpat, \@innerparstack,
+				  $pat, $safeeval);
 	 } elsif ($tokenpat->[0] eq 'E') {
 	   #clear out any tags that didn't end
 	   while ($tokenpat->[1] ne $innerstack[$#innerstack] 
 		  && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}
 	   $partstring = &callsub("end_$tokenpat->[1]",
-				  $target, $tokenpat, \@innerparstack)
+				  $target, $tokenpat, \@innerparstack,
+				  $pat, $safeeval);
 	 }
 	 #pass both the variable to the style tag, and the tag we 
 	 #are processing inside the <definedtag>
-	 $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
+	 if ($partstring ne "" ) {
+	   $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
 		$parstack[$#parstack].$innerparstack[$#innerparstack]);
+	 }
 	 if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
        }
      } else {
-       my $result = &callsub("start_$token->[1]", $target, $token, \@parstack);
-       $finaloutput .= &Apache::run::evaluate($result,$safeeval,
-					      $parstack[$#parstack]);
+       my $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
+			     $pars, $safeeval);
+       if ($result ne "" ) {
+	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
+						$parstack[$#parstack]);
+       }
      }              
    } elsif ($token->[0] eq 'E')  {
      #clear out any tags that didn't end
@@ -109,29 +118,36 @@ sub xmlparse {
        
        while  ($tokenpat = $pat->get_token) {
 	 if ($tokenpat->[0] eq 'T') {
-	   $partstring .= $tokenpat->[1];
+	   $partstring = $tokenpat->[1];
 	 } elsif ($tokenpat->[0] eq 'S') {
 	   push (@innerstack,$tokenpat->[1]);
 	   push (@innerparstack,&parstring($tokenpat));
 	   $partstring = &callsub("start_$tokenpat->[1]", 
-				  $target, $tokenpat, \@innerparstack)
+				  $target, $tokenpat, \@innerparstack,
+				  $pat, $safeeval);
 	 } elsif ($tokenpat->[0] eq 'E') {
 	   #clear out any tags that didn't end
 	   while ($tokenpat->[1] ne $innerstack[$#innerstack] 
 		  && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}
 	   $partstring = &callsub("end_$tokenpat->[1]",
-				  $target, $tokenpat, \@innerparstack)
+				  $target, $tokenpat, \@innerparstack,
+				  $pat, $safeeval);
 	 }
 	 #pass both the variable to the style tag, and the tag we 
 	 #are processing inside the <definedtag>
-	 $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
+	 if ( $partstring ne "" ) {
+	   $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
 		$parstack[$#parstack].$innerparstack[$#innerparstack]);
+	 }
 	 if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
        }
      } else {
-       my $result = &callsub("start_$token->[1]", $target, $token, \@parstack);
-       $finaloutput .= &Apache::run::evaluate($result,$safeeval,
-					      $parstack[$#parstack]);
+       my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
+			     $pars,$safeeval);
+       if ($result ne "") {
+	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
+						$parstack[$#parstack]);
+       }
      }
      pop @stack; 
      pop @parstack;
@@ -141,14 +157,14 @@ sub xmlparse {
 }
 
 sub callsub {
-  my ($sub,$target,$token,@parstack)=@_;
+  my ($sub,$target,$token,$parstack,$parser,$safeeval)=@_;
   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);
+      $currentstring = &$sub($target,$token,\@$parstack,$parser,$safeeval);
     } else {
       #print "NOT Calling sub $sub\n";
       if (defined($token->[4])) {
@@ -170,3 +186,8 @@ sub parstring {
 }
 1;
 __END__
+
+
+
+
+