--- loncom/xml/lonxml.pm	2000/06/29 18:52:54	1.7
+++ 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;
@@ -33,9 +34,9 @@ sub xmlparse {
  my $currentstring = '';
  my $finaloutput = ''; 
  my $newarg = '';
- my $tempostring = '';
  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);
@@ -56,107 +57,99 @@ sub xmlparse {
      # 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 = '';
+     push (@parstack,&parstring($token));
      
      if (exists $style_for_target{$token->[1]}) {
-       #print "Style for $token->[1] is " .$style_for_target{$token->[1]}."\n";
+       #basically recurse, but we never got more than one level down so just 
+       #create the new context here
+       my @innerstack = (); 
+       my @innerparstack = ();
        # use style file definition
-
-       $newarg = $style_for_target{$token->[1]};
-       
+       $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') {
 	   $partstring = $tokenpat->[1];
 	 } elsif ($tokenpat->[0] eq 'S') {
-	   my $sub="start_$tokenpat->[1]";
-	   $partstring = &callsub($sub, $target, $tokenpat, \@parstack)
+	   push (@innerstack,$tokenpat->[1]);
+	   push (@innerparstack,&parstring($tokenpat));
+	   $partstring = &callsub("start_$tokenpat->[1]", 
+				  $target, $tokenpat, \@innerparstack,
+				  $pat, $safeeval);
 	 } elsif ($tokenpat->[0] eq 'E') {
-	   my $sub="end_$tokenpat->[1]";
-	   $partstring = &callsub($sub, $target, $tokenpat, \@parstack)
+	   #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,
+				  $pat, $safeeval);
+	 }
+	 #pass both the variable to the style tag, and the tag we 
+	 #are processing inside the <definedtag>
+	 if ($partstring ne "" ) {
+	   $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
+		$parstack[$#parstack].$innerparstack[$#innerparstack]);
 	 }
-        # 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]);
+	 if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
        }
-       $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]);
+       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')  {
-     # 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]";
-       $finaloutput .= callsub($sub, $target, $token, \@parstack);
-     }
-     #---- end tag from the style file
+     #clear out any tags that didn't end
+     while ($token->[1] ne $stack[$#stack] 
+	    && ($#stack > 0)) {pop @stack;pop @parstack;}
+
      if (exists $style_for_target{'/'."$token->[1]"}) {
+       my @innerstack = (); 
+       my @innerparstack = ();
        $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;
-	 
-         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];
-		 }
-	       }
-	       
-               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; 
-	       print "want to use run\n";
-               &Apache::run::run($partstring,$safeeval);
-	       
-               $partstring = '';
-	     } elsif ($tokenpat->[1] eq 'evaluate') {		
-	       $outputstring = &Apache::run::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 {
-         my @very_temp = split(',',$parstack[$#parstack]);
-         map {my @ret= split('=',$_); $newarg =~ s/\$$ret[0]/$ret[1]/g; } @very_temp;
-       }
+       my $pat = HTML::TokeParser->new(\$newarg);
+       my $tokenpat;
+       my $partstring = '';
        
-       $finaloutput .= $newarg; 
+       while  ($tokenpat = $pat->get_token) {
+	 if ($tokenpat->[0] eq 'T') {
+	   $partstring = $tokenpat->[1];
+	 } elsif ($tokenpat->[0] eq 'S') {
+	   push (@innerstack,$tokenpat->[1]);
+	   push (@innerparstack,&parstring($tokenpat));
+	   $partstring = &callsub("start_$tokenpat->[1]", 
+				  $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,
+				  $pat, $safeeval);
+	 }
+	 #pass both the variable to the style tag, and the tag we 
+	 #are processing inside the <definedtag>
+	 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("end_$token->[1]", $target, $token, \@parstack,
+			     $pars,$safeeval);
+       if ($result ne "") {
+	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
+						$parstack[$#parstack]);
+       }
      }
+     pop @stack; 
      pop @parstack;
    }
  }
@@ -164,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])) {
@@ -185,5 +178,16 @@ sub callsub {
   return $currentstring;
 }
 
+sub parstring {
+  my ($token) = @_;
+  my $temp='';
+  map {$temp .= "my \$$_=\"$token->[2]->{$_}\";"} @{$token->[3]};
+  return $temp;
+}
 1;
 __END__
+
+
+
+
+