--- loncom/xml/lonxml.pm	2000/11/06 16:22:59	1.33
+++ loncom/xml/lonxml.pm	2000/11/07 23:39:07	1.36
@@ -101,7 +101,7 @@ sub xmlparse {
 #	 if ($target eq 'meta') {$Apache::lonxml::textredirection = 0;}
        #clear out any tags that didn't end
        while ($token->[1] ne $stack[$#stack] 
-	      && ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth($token);}
+	      && ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth($token);&Apache::lonxml::debug("Clearing out stack");}
        
        if (exists $style_for_target{'/'."$token->[1]"}) {
 
@@ -239,22 +239,24 @@ sub initdepth {
 
 sub increasedepth {
   my ($token) = @_;
-  if ($Apache::lonxml::depth<$Apache::lonxml::olddepth-1) {
-    $#Apache::lonxml::depthcounter--;
-    $Apache::lonxml::olddepth=$Apache::lonxml::depth;
-  }
   $Apache::lonxml::depth++;
-#  print "<br>s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1]<br>\n";
   $Apache::lonxml::depthcounter[$Apache::lonxml::depth]++;
   if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) {
     $Apache::lonxml::olddepth=$Apache::lonxml::depth;
   }
+#  my $curdepth=join('_',@Apache::lonxml::depthcounter);
+#  print "<br>s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]<br>\n";
 }
 
 sub decreasedepth {
   my ($token) = @_;
   $Apache::lonxml::depth--;
-#  print "<br>e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1]<br>\n";
+  if ($Apache::lonxml::depth<$Apache::lonxml::olddepth-1) {
+    $#Apache::lonxml::depthcounter--;
+    $Apache::lonxml::olddepth=$Apache::lonxml::depth+1;
+  }
+#  my $curdepth=join('_',@Apache::lonxml::depthcounter);
+#  print "<br>e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth <br>\n";
 }
 
 sub get_all_text {
@@ -274,7 +276,9 @@ sub get_all_text {
    } elsif ($token->[0] eq 'E')  {
      if ( $token->[1] eq $tag) { $depth--; }
      #skip sending back the last end tag
-     if ($depth > -1) { $result.=$token->[2]; }
+     if ($depth > -1) { $result.=$token->[2]; } else {
+       $pars->unget_token($token);
+     }
    }
  }
  return $result
@@ -296,13 +300,24 @@ sub parstring {
   my ($token) = @_;
   my $temp='';
   map {
-    if ($_=~/\w+/) {
+    unless ($_=~/\W/) {
       $temp .= "my \$$_=\"$token->[2]->{$_}\";"
     }
   } @{$token->[3]};
   return $temp;
 }
 
+sub writeallows {
+    my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
+    my $thisdir=$thisurl;
+    $thisdir=~s/\/[^\/]+$//;
+    my %httpref=();
+    map {
+       $httpref{'httpref.'.
+ 	        &Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl;              } @extlinks;
+    &Apache::lonnet::appenv(%httpref);
+}
+
 sub handler {
   my $request=shift;
 
@@ -338,6 +353,7 @@ sub handler {
 
   $request->print('</body>');
   $request->print(&Apache::lontexconvert::footer());
+  writeallows($request->uri);
   return 'OK';
 }