--- loncom/xml/lonxml.pm	2000/10/11 13:07:49	1.25
+++ loncom/xml/lonxml.pm	2000/11/06 18:42:38	1.35
@@ -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'};
@@ -50,6 +59,7 @@ sub xmlparse {
 #need to inspect this class of ops
 # $safeeval->deny(":base_orig");
  $safeinit .= ';$external::target='.$target.';';
+ $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
  &Apache::run::run($safeinit,$safeeval);
 #-------------------- Redefinition of the target in the case of compound target
 
@@ -62,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
@@ -87,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);}
@@ -149,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));
@@ -201,17 +213,11 @@ sub callsub {
       my $sub1;
     no strict 'refs';
     if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
-#      &Apache::lonxml::debug("Calling sub $sub in $space<br>\n");
-#      if ( $sub eq "start_parserlib" ) {
-#	  print "me:".%$style.":\n";
-#      }
+      #&Apache::lonxml::debug("Calling sub $sub in $space<br>\n");
       $sub1="$space\:\:$sub";
       $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
       $currentstring = &$sub1($target,$token,$parstack,$parser,
 			     $safeeval,$style);
-#      if ( $sub eq "start_parserlib" ) {
-#	  print "me2:".%$style.":";
-#      }
     } else {
       #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br>\n");
       if (defined($token->[4])) {
@@ -290,38 +296,35 @@ sub parstring {
   my ($token) = @_;
   my $temp='';
   map {
-    if ($_=~/\w+/) {
+    unless ($_=~/\W/) {
       $temp .= "my \$$_=\"$token->[2]->{$_}\";"
     }
   } @{$token->[3]};
   return $temp;
 }
-#<<<<<<< lonxml.pm
+
+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;
 
   my $target='web';
   $Apache::lonxml::debug=1;
-  $request->content_type('text/html');
-#  $request->send_http_header;  
   if ($ENV{'browser.mathml'}) {
-    $request->print( '<?xml version="1.0"?>'
-            .'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'
-            .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
-            .'[<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">]>'
-            .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" ' 
-            .'xmlns="http://www.w3.org/TR/REC-html40">'
-		 .'<body bgcolor="#FFFFFF">'."\n");
-  } else {      
-    my $headerstring='<html>';
-      if ($ENV{'browser.os'} eq 'mac') { 
-         $headerstring.="<head>\n"
-             .'<meta Content-Type="text/html; charset=x-mac-roman">'
-	     ."\n</head>\n";
-      }
-    $request->print($headerstring.'<body bgcolor="#FFFFFF">'."\n");
+    $request->content_type('text/xml');
+  } else {
+    $request->content_type('text/html');
   }
+
 #  $request->print(<<ENDHEADER);
 #<html>
 #<head>
@@ -330,13 +333,24 @@ sub handler {
 #<body bgcolor="#FFFFFF">
 #ENDHEADER
 #  &Apache::lonhomework::send_header($request);
+  $request->send_http_header;
+
+  return 'OK' if $request->header_only;
+
+  $request->print(&Apache::lontexconvert::header());
+
+  $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 follows:");  
   $request->print($result);
-#  $request->print(":Result ends");
+
+  $request->print('</body>');
+  $request->print(&Apache::lontexconvert::footer());
+  writeallows($request->uri);
+  return 'OK';
 }
  
 $Apache::lonxml::debug=0;