--- loncom/xml/lonxml.pm	2000/06/29 18:52:54	1.7
+++ loncom/xml/lonxml.pm	2000/06/29 20:27:13	1.8
@@ -33,7 +33,6 @@ sub xmlparse {
  my $currentstring = '';
  my $finaloutput = ''; 
  my $newarg = '';
- my $tempostring = '';
  my $safeeval = new Safe;
  $safeeval->permit("entereval");
 #-------------------- Redefinition of the target in the case of compound target
@@ -56,43 +55,44 @@ 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)
 	 } 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)
 	 }
-        # 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]);
+	 #pass both the variable to the style tag, and the tag we 
+	 #are processing inside the <definedtag>
+	 $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
+		$parstack[$#parstack].$innerparstack[$#innerparstack]);
+	 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);
+       $finaloutput .= &Apache::run::evaluate($result,$safeeval,
+					      $parstack[$#parstack]);
      }              
    } elsif ($token->[0] eq 'E')  {
      # Put here check for correct final tag (to avoid existence of 
@@ -185,5 +185,11 @@ sub callsub {
   return $currentstring;
 }
 
+sub parstring {
+  my ($token) = @_;
+  my $temp='';
+  map {$temp .= "my \$$_=\"$token->[2]->{$_}\";"} @{$token->[3]};
+  return $temp;
+}
 1;
 __END__