--- loncom/xml/lonxml.pm	2000/07/25 21:28:22	1.13
+++ loncom/xml/lonxml.pm	2001/03/23 22:08:05	1.60
@@ -2,13 +2,19 @@
 # XML Parser Module 
 #
 # last modified 06/26/00 by Alexander Sakharuk
+# 11/6 Gerd Kortemeyer
+# 6/1/1 Gerd Kortemeyer
+# 2/21,3/13 Guy
 
 package Apache::lonxml; 
-
+use vars 
+qw(@pwd @outputstack $redirection $import @extlinks $metamode);
 use strict;
 use HTML::TokeParser;
 use Safe;
+use Safe::Hole;
 use Opcode;
+use Apache::Constants qw(:common);
 
 sub register {
   my $space;
@@ -19,175 +25,470 @@ sub register {
     $Apache::lonxml::alltags{$temptag}=$space;
   }
 }
-                                     
+
+sub printalltags {
+  my $temp;
+  foreach $temp (sort keys %Apache::lonxml::alltags) {
+    &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
+  }
+}
 use Apache::style;
 use Apache::lontexconvert;
 use Apache::run;
 use Apache::londefdef;
 use Apache::scripttag;
+use Apache::edit;
 #==================================================   Main subroutine: xmlparse  
+@pwd=();
+@outputstack = ();
+$redirection = 0;
+$import = 1;
+@extlinks=();
+$metamode = 0;
 
 sub xmlparse {
 
- my ($target,$content_file_string,%style_for_target) = @_;
- my $pars = HTML::TokeParser->new(\$content_file_string);
+ my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
+ if ($target eq 'meta') {
+   # meta mode is a bit weird only some output is to be turned off
+   #<output> tag turns metamode off (defined in londefdef.pm)
+   $Apache::lonxml::redirection = 0;
+   $Apache::lonxml::metamode = 1;
+   $Apache::lonxml::import = 0;
+ } elsif ($target eq 'grade') {
+   &startredirection;
+   $Apache::lonxml::metamode = 0;
+   $Apache::lonxml::import = 1;
+ } else {
+   $Apache::lonxml::metamode = 0;
+   $Apache::lonxml::redirection = 0;
+   $Apache::lonxml::import = 1;
+ }
+ #&printalltags();
+ my @pars = ();
+ @Apache::lonxml::pwd=();
+ my $pwd=$ENV{'request.filename'};
+ $pwd =~ s:/[^/]*$::;
+ &newparser(\@pars,\$content_file_string,$pwd);
  my $currentstring = '';
  my $finaloutput = ''; 
  my $newarg = '';
+ my $result;
+
  my $safeeval = new Safe;
+ my $safehole = new Safe::Hole;
  $safeeval->permit("entereval");
  $safeeval->permit(":base_math");
+ $safeeval->deny(":base_io");
+ $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
+#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
 
  ($target, my @tenta) = split('&&',$target);
 
-#------------------------- Stack definition (in stack we have all current tags)
-
  my @stack = (); 
  my @parstack = ();
-
-#------------------------------------- Parse input string (content_file_string)
- 
+ &initdepth;
  my $token;
- 
- while ($token = $pars->get_token) {
-   if ($token->[0] eq 'T') {
-     $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');
-   } elsif ($token->[0] eq 'S') {
-     # add tag to stack 	    
-     push (@stack,$token->[1]);
-     # add parameters list to another stack
-     push (@parstack,&parstring($token));
-     
-     if (exists $style_for_target{$token->[1]}) {
-       #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]};       
-       my $pat = HTML::TokeParser->new(\$newarg);
-       my $tokenpat = '';
-       my $partstring = '';
-
-       while  ($tokenpat = $pat->get_token) {
-	 if ($tokenpat->[0] eq 'T') {
-	   $partstring = $tokenpat->[1];
-	 } elsif ($tokenpat->[0] eq 'S') {
-	   push (@innerstack,$tokenpat->[1]);
-	   push (@innerparstack,&parstring($tokenpat));
-	   $partstring = &callsub("start_$tokenpat->[1]", 
-				  $target, $tokenpat, \@innerparstack,
-				  $pat, $safeeval);
-	 } elsif ($tokenpat->[0] eq 'E') {
-	   #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,
-				  $pat, $safeeval);
+ while ( $#pars > -1 ) {
+   while ($token = $pars[$#pars]->get_token) {
+     if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
+       if (!$metamode) { $result=$token->[1]; }
+     } elsif ($token->[0] eq 'PI') {
+       if (!$metamode) { $result=$token->[2]; }
+     } elsif ($token->[0] eq 'S') {
+       # add tag to stack 	    
+       push (@stack,$token->[1]);
+       # add parameters list to another stack
+       push (@parstack,&parstring($token));
+       &increasedepth($token);       
+       if (exists $style_for_target{$token->[1]}) {
+	 if ($metamode) {
+	   $result = $style_for_target{$token->[1]};
+	 } elsif ($Apache::lonxml::redirection) {
+	   $Apache::lonxml::outputstack['-1'] .=  
+	     &recurse($style_for_target{$token->[1]},$target,$safeeval,
+		      \%style_for_target,@parstack);
+	 } else {
+	   $finaloutput .= &recurse($style_for_target{$token->[1]},$target,
+				    $safeeval,\%style_for_target,@parstack);
 	 }
-	 #pass both the variable to the style tag, and the tag we 
-	 #are processing inside the <definedtag>
-	 if ($partstring ne "" ) {
-	   $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
-		$parstack[$#parstack].$innerparstack[$#innerparstack]);
-	 }
-	 if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
-       }
-     } else {
-       my $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
-			     $pars, $safeeval);
-       if ($result ne "" ) {
-	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
-						$parstack[$#parstack]);
+       } else {
+	 $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
+			    \@pars, $safeeval, \%style_for_target);
+       }              
+     } elsif ($token->[0] eq 'E')  {
+       #clear out any tags that didn't end
+       while ($token->[1] ne $stack[$#stack] && ($#stack > -1)) {
+	 &Apache::lonxml::warning("Unbalanced tags in resource $stack['-1']");
+	 pop @stack;pop @parstack;&decreasedepth($token);
        }
-     }              
-   } elsif ($token->[0] eq 'E')  {
-     #clear out any tags that didn't end
-     while ($token->[1] ne $stack[$#stack] 
-	    && ($#stack > 0)) {pop @stack;pop @parstack;}
-
-     if (exists $style_for_target{'/'."$token->[1]"}) {
-       my @innerstack = (); 
-       my @innerparstack = ();
-       $newarg = $style_for_target{'/'."$token->[1]"};
-       my $pat = HTML::TokeParser->new(\$newarg);
-       my $tokenpat;
-       my $partstring = '';
        
-       while  ($tokenpat = $pat->get_token) {
-	 if ($tokenpat->[0] eq 'T') {
-	   $partstring = $tokenpat->[1];
-	 } elsif ($tokenpat->[0] eq 'S') {
-	   push (@innerstack,$tokenpat->[1]);
-	   push (@innerparstack,&parstring($tokenpat));
-	   $partstring = &callsub("start_$tokenpat->[1]", 
-				  $target, $tokenpat, \@innerparstack,
-				  $pat, $safeeval);
-	 } elsif ($tokenpat->[0] eq 'E') {
-	   #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,
-				  $pat, $safeeval);
+       if (exists $style_for_target{'/'."$token->[1]"}) {
+	 if ($metamode) {
+	   $result = $style_for_target{$token->[1]};
+	 } elsif ($Apache::lonxml::redirection) {
+	   $Apache::lonxml::outputstack['-1'] .=  
+	     &recurse($style_for_target{'/'."$token->[1]"},
+		      $target,$safeeval,\%style_for_target,@parstack);
+	 } else {
+	   $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"},
+				    $target,$safeeval,\%style_for_target,
+				    @parstack);
 	 }
-	 #pass both the variable to the style tag, and the tag we 
-	 #are processing inside the <definedtag>
-	 if ( $partstring ne "" ) {
-	   $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
-		$parstack[$#parstack].$innerparstack[$#innerparstack]);
-	 }
-	 if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
+
+       } else {
+	 $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
+			    \@pars,$safeeval, \%style_for_target);
        }
      } else {
-       my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
-			     $pars,$safeeval);
-       if ($result ne "") {
-	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
-						$parstack[$#parstack]);
+       &Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
+     }
+     #evaluate variable refs in result
+     if ($result ne "") {
+       if ( $#parstack > -1 ) {
+	 if ($Apache::lonxml::redirection) {
+	   $Apache::lonxml::outputstack['-1'] .= 
+	     &Apache::run::evaluate($result,$safeeval,$parstack[$#parstack]);
+	 } else {
+	   $finaloutput .= &Apache::run::evaluate($result,$safeeval,
+						  $parstack[$#parstack]);
+	 }
+       } else {
+	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,'');
        }
+       $result = '';
+     } 
+     if ($token->[0] eq 'E') { 
+       pop @stack;pop @parstack;&decreasedepth($token);
      }
-     pop @stack; 
-     pop @parstack;
    }
+   pop @pars;
+   pop @Apache::lonxml::pwd;
  }
+
+# if ($target eq 'meta') {
+#   $finaloutput.=&endredirection;
+# }
  return $finaloutput;
 }
 
+sub recurse {
+  
+  my @innerstack = (); 
+  my @innerparstack = ();
+  my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;
+  my @pat = ();
+  &newparser(\@pat,\$newarg);
+  my $tokenpat;
+  my $partstring = '';
+  my $output='';
+  my $decls='';
+  while ( $#pat > -1 ) {
+    while  ($tokenpat = $pat[$#pat]->get_token) {
+      if (($tokenpat->[0] eq 'T') || ($tokenpat->[0] eq 'C') || ($tokenpat->[0] eq 'D') ) {
+	$partstring = $tokenpat->[1];
+      } elsif ($tokenpat->[0] eq 'PI') {
+	$partstring = $tokenpat->[2];
+      } elsif ($tokenpat->[0] eq 'S') {
+	push (@innerstack,$tokenpat->[1]);
+	push (@innerparstack,&parstring($tokenpat));
+	&increasedepth($tokenpat);
+	$partstring = &callsub("start_$tokenpat->[1]", 
+			       $target, $tokenpat, \@innerparstack,
+			       \@pat, $safeeval, $style_for_target);
+      } elsif ($tokenpat->[0] eq 'E') {
+	#clear out any tags that didn't end
+	while ($tokenpat->[1] ne $innerstack[$#innerstack] 
+	       && ($#innerstack > -1)) {
+	  &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
+	  pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
+	}
+	$partstring = &callsub("end_$tokenpat->[1]",
+			       $target, $tokenpat, \@innerparstack,
+			       \@pat, $safeeval, $style_for_target);
+      } else {
+	&Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");
+      }
+      #pass both the variable to the style tag, and the tag we 
+      #are processing inside the <definedtag>
+      if ( $partstring ne "" ) {
+	if ( $#parstack > -1 ) { 
+	  if ( $#innerparstack > -1 ) { 
+	    $decls= $parstack[$#parstack].$innerparstack[$#innerparstack];
+	  } else {
+	    $decls= $parstack[$#parstack];
+	  }
+	} else {
+	  if ( $#innerparstack > -1 ) { 
+	    $decls=$innerparstack[$#innerparstack];
+	  } else {
+	    $decls='';
+	  }
+	}
+	$output .= &Apache::run::evaluate($partstring,$safeeval,$decls);
+	$partstring = '';
+      }
+      if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack;
+				 &decreasedepth($tokenpat);}
+    }
+    pop @pat;
+    pop @Apache::lonxml::pwd;
+  }
+  return $output;
+}
+
 sub callsub {
-  my ($sub,$target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $currentstring='';
   {
+    my $sub1;
     no strict 'refs';
+    if ($target eq 'edit' && $token->[0] eq 'S') {
+      $currentstring = &Apache::edit::tag_start($target,$token,$parstack,$parser,
+						$safeeval,$style);
+    }
     if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
-      #print "Calling sub $sub in $space \n";
-      $sub="$space\:\:$sub";
-      $currentstring = &$sub($target,$token,\@$parstack,$parser,$safeeval);
+      #&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);
     } else {
-      #print "NOT Calling sub $sub\n";
-      if (defined($token->[4])) {
-	$currentstring = $token->[4];
+      #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br />\n");
+      if (defined($token->[4]) && !$metamode) {
+	$currentstring .= $token->[4];
       } else {
-	$currentstring = $token->[2];
+	$currentstring .= $token->[2];
       }
     }
+    if ($target eq 'edit' && $token->[0] eq 'E') {
+      $currentstring = &Apache::edit::tag_end($target,$token,$parstack,$parser,
+						$safeeval,$style);
+    }
     use strict 'refs';
   }
   return $currentstring;
 }
 
+sub startredirection {
+  $Apache::lonxml::redirection++;
+  push (@Apache::lonxml::outputstack, '');
+}
+
+sub endredirection {
+  if (!$Apache::lonxml::redirection) {
+    &Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuggin information:".join ":",caller);
+    return '';
+  }
+  $Apache::lonxml::redirection--;
+  pop @Apache::lonxml::outputstack;
+}
+
+sub initdepth {
+  @Apache::lonxml::depthcounter=();
+  $Apache::lonxml::depth=-1;
+  $Apache::lonxml::olddepth=-1;
+}
+
+sub increasedepth {
+  my ($token) = @_;
+  $Apache::lonxml::depth++;
+  $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);
+  &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
+#print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
+}
+
+sub decreasedepth {
+  my ($token) = @_;
+  $Apache::lonxml::depth--;
+  if ($Apache::lonxml::depth<$Apache::lonxml::olddepth-1) {
+    $#Apache::lonxml::depthcounter--;
+    $Apache::lonxml::olddepth=$Apache::lonxml::depth+1;
+  }
+  if (  $Apache::lonxml::depth < -1) {
+    &Apache::lonxml::warning("Unbalanced tags in resource");   
+    $Apache::lonxml::depth='-1';
+  }
+  my $curdepth=join('_',@Apache::lonxml::depthcounter);
+  &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
+#print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
+}
+
+sub get_all_text {
+
+ my($tag,$pars)= @_;
+ my $depth=0;
+ my $token;
+ my $result='';
+ if ( $tag =~ m:^/: ) { 
+   my $tag=substr($tag,1); 
+#   &Apache::lonxml::debug("have:$tag:");
+   while (($depth >=0) && ($token = $pars->get_token)) {
+#     &Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]");
+     if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+       $result.=$token->[1];
+     } elsif ($token->[0] eq 'PI') {
+       $result.=$token->[2];
+     } elsif ($token->[0] eq 'S') {
+       if ($token->[1] eq $tag) { $depth++; }
+       $result.=$token->[4];
+     } elsif ($token->[0] eq 'E')  {
+       if ( $token->[1] eq $tag) { $depth--; }
+       #skip sending back the last end tag
+       if ($depth > -1) { $result.=$token->[2]; } else {
+	 $pars->unget_token($token);
+       }
+     }
+   }
+ } else {
+   while ($token = $pars->get_token) {
+#     &Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");
+     if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
+       $result.=$token->[1];
+     } elsif ($token->[0] eq 'PI') {
+       $result.=$token->[2];
+     } elsif ($token->[0] eq 'S') {
+       if ( $token->[1] eq $tag) { 
+	 $pars->unget_token($token); last;
+       } else {
+	 $result.=$token->[4];
+       }
+     } elsif ($token->[0] eq 'E')  {
+       $result.=$token->[2];
+     }
+   }
+ }
+# &Apache::lonxml::debug("Exit:$result:");
+ return $result
+}
+
+sub newparser {
+  my ($parser,$contentref,$dir) = @_;
+  push (@$parser,HTML::TokeParser->new($contentref));
+  $$parser['-1']->xml_mode('1');
+  if ( $dir eq '' ) {
+    push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
+  } else {
+    push (@Apache::lonxml::pwd, $dir);
+  } 
+#  &Apache::lonxml::debug("pwd:$#Apache::lonxml::pwd");
+#  &Apache::lonxml::debug("pwd:$Apache::lonxml::pwd[$#Apache::lonxml::pwd]");
+}
+
 sub parstring {
   my ($token) = @_;
   my $temp='';
-  map {$temp .= "my \$$_=\"$token->[2]->{$_}\";"} @{$token->[3]};
+  map {
+    unless ($_=~/\W/) {
+      my $val=$token->[2]->{$_};
+      $val =~ s/([\%\@\\])/\\$1/g;
+      #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
+      $temp .= "my \$$_=\"$val\";"
+    }
+  } @{$token->[3]};
   return $temp;
 }
-1;
-__END__
 
+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=0;
+  if ($ENV{'browser.mathml'}) {
+    $request->content_type('text/xml');
+  } 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;
+
+  $request->print(&Apache::lontexconvert::header());
+
+  $request->print('<body bgcolor="#FFFFFF">'."\n");
+
+  my $file=&Apache::lonnet::filelocation("",$request->uri);
+  my %mystyle;
+  my $result = ''; 
+  my $filecontents=&Apache::lonnet::getfile($file);
+  if ($filecontents == -1) {
+    &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
+    $filecontents='';
+  } else {
+    $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
+  }
+  $request->print($result);
 
 
+  $request->print('</body>');
+  $request->print(&Apache::lontexconvert::footer());
+  writeallows($request->uri);
+  return OK;
+}
+ 
+$Apache::lonxml::debug=0;
+sub debug {
+  if ($Apache::lonxml::debug eq 1) {
+    print "DEBUG:".$_[0]."<br />\n";
+  }
+}
 
+sub error {
+  if ($Apache::lonxml::debug eq 1) {
+    print "<b>ERROR:</b>".$_[0]."<br />\n";
+  } else {
+    print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";
+    #notify author
+    &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$_[0]);
+    #notify course
+    if ( $ENV{'request.course.id'} ) {
+      my $users=$ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'};
+      foreach my $user (split /\,/, $users) {
+	($user,my $domain) = split /:/, $user;
+	&Apache::lonmsg::user_normal_msg($user,$domain,"Error in $ENV{'request.filename'}",$_[0]);
+      }
+    }
+    
+    #FIXME probably shouldn't have me get everything forever.
+    &Apache::lonmsg::user_normal_msg('albertel','msu',"Error in $ENV{'request.filename'}",$_[0]);
+    #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]);   
+  }
+}
+
+sub warning {
+  if ($Apache::lonxml::debug eq 1) {
+    print "<b>W</b>ARNING<b>:</b>".$_[0]."<br />\n";
+  }
+}
+
+1;
+__END__