--- loncom/xml/lonxml.pm	2000/10/05 19:30:14	1.23
+++ loncom/xml/lonxml.pm	2000/10/11 21:07:59	1.26
@@ -27,6 +27,9 @@ use Apache::londefdef;
 use Apache::scripttag;
 #==================================================   Main subroutine: xmlparse  
 @Apache::lonxml::pwd=();
+$Apache::lonxml::outputstack = '';
+$Apache::lonxml::redirection = 1;
+
 sub xmlparse {
 
  my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
@@ -39,6 +42,7 @@ sub xmlparse {
  my $finaloutput = ''; 
  my $newarg = '';
  my $result;
+
  my $safeeval = new Safe;
  $safeeval->permit("entereval");
  $safeeval->permit(":base_math");
@@ -46,6 +50,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
 
@@ -67,9 +72,17 @@ sub xmlparse {
        push (@parstack,&parstring($token));
        &increasedepth($token);       
        if (exists $style_for_target{$token->[1]}) {
-	 $finaloutput .= &recurse($style_for_target{$token->[1]},
-				  $target,$safeeval,\%style_for_target,
-				  @parstack);
+
+	if ($Apache::lonxml::redirection == 1) {
+	  $finaloutput .= &recurse($style_for_target{$token->[1]},
+		  		  $target,$safeeval,\%style_for_target,
+	 		 	  @parstack);
+        } else {
+          $Apache::lonxml::outputstack .=  &recurse($style_for_target{$token->[1]},
+		  		  $target,$safeeval,\%style_for_target,
+	 		 	  @parstack);
+        }
+
        } else {
 	 $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
 			       \@pars, $safeeval, \%style_for_target);
@@ -80,28 +93,46 @@ sub xmlparse {
 	      && ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth($token);}
        
        if (exists $style_for_target{'/'."$token->[1]"}) {
+
+	if ($Apache::lonxml::redirection == 1) {
 	 $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"},
 				  $target,$safeeval,\%style_for_target,
 				  @parstack);
+        } else {
+         $Apache::lonxml::outputstack .=  &recurse($style_for_target{'/'."$token->[1]"},
+				  $target,$safeeval,\%style_for_target,
+				  @parstack);
+        }
+
        } else {
 	 $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
 			       \@pars,$safeeval, \%style_for_target);
        }
      }
-     if ($result ne "" ) {
-       if ( $#parstack > -1 ) { 
+     if ($result ne "") {
+       if ( $#parstack > -1 ) {
+ 
+	if ($Apache::lonxml::redirection == 1) {
 	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
 						$parstack[$#parstack]);
+        } else {
+         $Apache::lonxml::outputstack .= &Apache::run::evaluate($result,$safeeval,
+						$parstack[$#parstack]);
+        }
+
        } else {
 	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,'');
        }
        $result = '';
+     } else {
+         $finaloutput .= $result;
      }
      if ($token->[0] eq 'E') { pop @stack;pop @parstack;&decreasedepth($token);}
    }
    pop @pars;
    pop @Apache::lonxml::pwd;
  }
+
  return $finaloutput;
 }
 
@@ -168,12 +199,13 @@ sub callsub {
   my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $currentstring='';
   {
+      my $sub1;
     no strict 'refs';
     if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
       #&Apache::lonxml::debug("Calling sub $sub in $space<br>\n");
-      $sub="$space\:\:$sub";
+      $sub1="$space\:\:$sub";
       $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
-      $currentstring = &$sub($target,$token,$parstack,$parser,
+      $currentstring = &$sub1($target,$token,$parstack,$parser,
 			     $safeeval,$style);
     } else {
       #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br>\n");
@@ -220,6 +252,8 @@ sub get_all_text {
  my $depth=0;
  my $token;
  my $result='';
+ my $tag=substr($tag,1); #strip the / off the tag
+# &Apache::lonxml::debug("have:$tag:");
  while (($depth >=0) && ($token = $pars->get_token)) {
    if ($token->[0] eq 'T') {
      $result.=$token->[1];
@@ -227,7 +261,7 @@ sub get_all_text {
      if ($token->[1] eq $tag) { $depth++; }
      $result.=$token->[4];
    } elsif ($token->[0] eq 'E')  {
-     if ($token->[1] eq $tag) { $depth--; }
+     if ( $token->[1] eq $tag) { $depth--; }
      #skip sending back the last end tag
      if ($depth > -1) { $result.=$token->[2]; }
    }
@@ -257,7 +291,49 @@ sub parstring {
   } @{$token->[3]};
   return $temp;
 }
+#<<<<<<< lonxml.pm
+
+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->print(<<ENDHEADER);
+#<html>
+#<head>
+#<title>Just test</title>
+#</head>
+#<body bgcolor="#FFFFFF">
+#ENDHEADER
+#  &Apache::lonhomework::send_header($request);
+  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");
+}
+ 
 $Apache::lonxml::debug=0;
 sub debug {
   if ($Apache::lonxml::debug eq 1) {
@@ -278,5 +354,18 @@ __END__
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+