--- loncom/xml/lonxml.pm	2000/10/11 21:12:42	1.27
+++ loncom/xml/lonxml.pm	2000/11/15 15:29:33	1.39
@@ -2,9 +2,11 @@
 # XML Parser Module 
 #
 # last modified 06/26/00 by Alexander Sakharuk
+# 11/6 Gerd Kortemeyer
 
 package Apache::lonxml; 
-
+use vars 
+qw(@pwd $outputstack $redirection $textredirection $on_offimport @extlinks);
 use strict;
 use HTML::TokeParser;
 use Safe;
@@ -26,13 +28,20 @@ use Apache::run;
 use Apache::londefdef;
 use Apache::scripttag;
 #==================================================   Main subroutine: xmlparse  
-@Apache::lonxml::pwd=();
-$Apache::lonxml::outputstack = '';
-$Apache::lonxml::redirection = 1;
+@pwd=();
+$outputstack = '';
+$redirection = 1;
+$textredirection = 1;
+$on_offimport = 0;
+@extlinks=();
 
 sub xmlparse {
 
  my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
+ if ($target eq 'meta') 
+   {$Apache::lonxml::textredirection = 0;
+    $Apache::lonxml::on_offimport = 1;
+ }
  my @pars = ();
  @Apache::lonxml::pwd=();
  my $pwd=$ENV{'request.filename'};
@@ -63,9 +72,10 @@ sub xmlparse {
  while ( $#pars > -1 ) {
    while ($token = $pars[$#pars]->get_token) {
      if ($token->[0] eq 'T') {
-       $result=$token->[1];
+	 if ($Apache::lonxml::textredirection == 1) {$result=$token->[1];}
 #       $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');
      } elsif ($token->[0] eq 'S') {
+#            if ($target eq 'meta' and $token->[2]->{metaout} eq 'ON') {$Apache::lonxml::textredirection = 1;}
        # add tag to stack 	    
        push (@stack,$token->[1]);
        # add parameters list to another stack
@@ -88,6 +98,7 @@ sub xmlparse {
 			       \@pars, $safeeval, \%style_for_target);
        }              
      } elsif ($token->[0] eq 'E')  {
+#	 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);}
@@ -150,7 +161,7 @@ sub recurse {
   while ( $#pat > -1 ) {
     while  ($tokenpat = $pat[$#pat]->get_token) {
       if ($tokenpat->[0] eq 'T') {
-	$partstring = $tokenpat->[1];
+	  if ($Apache::lonxml::textredirection == 1) {$partstring = $tokenpat->[1];}
       } elsif ($tokenpat->[0] eq 'S') {
 	push (@innerstack,$tokenpat->[1]);
 	push (@innerparstack,&parstring($tokenpat));
@@ -228,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 {
@@ -263,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
@@ -285,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;
 
@@ -302,22 +328,33 @@ sub handler {
   } else {
     $request->content_type('text/html');
   }
+
+#  $request->print(<<ENDHEADER);
+#<html>
+#<head>
+#<title>Just test</title>
+#</head>
+#<body bgcolor="#FFFFFF">
+#ENDHEADER
+#  &Apache::lonhomework::send_header($request);
   $request->send_http_header;
 
-  return OK if $request->header_only;
+  return 'OK' if $request->header_only;
 
   $request->print(&Apache::lontexconvert::header());
 
-  $request->print($headerstring.'<body bgcolor="#FFFFFF">'."\n");
+  $request->print('<body bgcolor="#FFFFFF">'."\n");
 
   my $file = "/home/httpd/html".$request->uri;
   my %mystyle;
   my $result = '';
   $result = Apache::lonxml::xmlparse($target, &Apache::lonnet::getfile($file),'',%mystyle);
   $request->print($result);
-  $r->print('</body>');
-  $r->print(&Apache::lontexconvert::footer());
-  return OK;
+
+  $request->print('</body>');
+  $request->print(&Apache::lontexconvert::footer());
+  writeallows($request->uri);
+  return 'OK';
 }
  
 $Apache::lonxml::debug=0;