--- loncom/xml/lonxml.pm	2000/11/22 17:35:13	1.40
+++ loncom/xml/lonxml.pm	2001/03/20 16:47:21	1.58
@@ -3,15 +3,18 @@
 #
 # 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 $textredirection $on_offimport @extlinks);
+qw(@pwd @outputstack $redirection $textredirection $import @extlinks);
 use strict;
 use HTML::TokeParser;
 use Safe;
 use Safe::Hole;
 use Opcode;
+use Apache::Constants qw(:common);
 
 sub register {
   my $space;
@@ -22,7 +25,13 @@ 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;
@@ -30,19 +39,25 @@ use Apache::londefdef;
 use Apache::scripttag;
 #==================================================   Main subroutine: xmlparse  
 @pwd=();
-$outputstack = '';
-$redirection = 1;
-$textredirection = 1;
-$on_offimport = 0;
+@outputstack = ();
+$redirection = 0;
+$import = 1;
 @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;
+ if ($target eq 'meta') {
+   &startredirection;
+   $Apache::lonxml::import = 0;
+ } elsif ($target eq 'grade') {
+   &startredirection;
+   $Apache::lonxml::import = 1;
+ } else {
+   $Apache::lonxml::redirection = 0;
+   $Apache::lonxml::import = 1;
  }
+ #&printalltags();
  my @pars = ();
  @Apache::lonxml::pwd=();
  my $pwd=$ENV{'request.filename'};
@@ -74,74 +89,72 @@ sub xmlparse {
  my $token;
  while ( $#pars > -1 ) {
    while ($token = $pars[$#pars]->get_token) {
-     if ($token->[0] eq 'T') {
-	 if ($Apache::lonxml::textredirection == 1) {$result=$token->[1];}
-#       $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');
+     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 ($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
        push (@parstack,&parstring($token));
        &increasedepth($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);
-        }
-
+	 if ($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);
+	 }
        } else {
 	 $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
-			       \@pars, $safeeval, \%style_for_target);
+			    \@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);}
+       while ($token->[1] ne $stack[$#stack] && ($#stack > -1)) {
+	 &Apache::lonxml::warning("Unbalanced tags in resource $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);
-        }
-
+	 if ($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);
+	 }
+	 
        } else {
 	 $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
-			       \@pars,$safeeval, \%style_for_target);
+			    \@pars,$safeeval, \%style_for_target);
        }
+     } else {
+       &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 == 1) {
-	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
-						$parstack[$#parstack]);
-        } else {
-         $Apache::lonxml::outputstack .= &Apache::run::evaluate($result,$safeeval,
-						$parstack[$#parstack]);
-        }
-
+	 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 = '';
-     } else {
-         $finaloutput .= $result;
+     } 
+     if ($token->[0] eq 'E') { 
+       pop @stack;pop @parstack;&decreasedepth($token);
      }
-     if ($token->[0] eq 'E') { pop @stack;pop @parstack;&decreasedepth($token);}
    }
    pop @pars;
    pop @Apache::lonxml::pwd;
@@ -163,8 +176,10 @@ sub recurse {
   my $decls='';
   while ( $#pat > -1 ) {
     while  ($tokenpat = $pat[$#pat]->get_token) {
-      if ($tokenpat->[0] eq 'T') {
-	  if ($Apache::lonxml::textredirection == 1) {$partstring = $tokenpat->[1];}
+      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));
@@ -175,11 +190,15 @@ sub recurse {
       } elsif ($tokenpat->[0] eq 'E') {
 	#clear out any tags that didn't end
 	while ($tokenpat->[1] ne $innerstack[$#innerstack] 
-	       && ($#innerstack > -1)) {pop @innerstack;pop @innerparstack;
-					&decreasedepth($tokenpat);}
+	       && ($#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>
@@ -216,13 +235,13 @@ 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");
+      #&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 {
-      #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br>\n");
+      #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br />\n");
       if (defined($token->[4])) {
 	$currentstring = $token->[4];
       } else {
@@ -234,6 +253,20 @@ sub callsub {
   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;
@@ -247,8 +280,9 @@ sub increasedepth {
   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";
+  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 {
@@ -258,8 +292,13 @@ sub decreasedepth {
     $#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";
+  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 {
@@ -268,28 +307,52 @@ 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];
-   } 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);
+ 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 {
@@ -304,7 +367,10 @@ sub parstring {
   my $temp='';
   map {
     unless ($_=~/\W/) {
-      $temp .= "my \$$_=\"$token->[2]->{$_}\";"
+      my $val=$token->[2]->{$_};
+      $val =~ s/([\%\@\\])/\\$1/g;
+      #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
+      $temp .= "my \$$_=\"$val\";"
     }
   } @{$token->[3]};
   return $temp;
@@ -323,9 +389,9 @@ sub writeallows {
 
 sub handler {
   my $request=shift;
-
+  
   my $target='web';
-  $Apache::lonxml::debug=1;
+  $Apache::lonxml::debug=0;
   if ($ENV{'browser.mathml'}) {
     $request->content_type('text/xml');
   } else {
@@ -342,56 +408,65 @@ sub handler {
 #  &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('<body bgcolor="#FFFFFF">'."\n");
 
-  my $file = "/home/httpd/html".$request->uri;
+  my $file=&Apache::lonnet::filelocation("",$request->uri);
   my %mystyle;
-  my $result = '';
-  $result = Apache::lonxml::xmlparse($target, &Apache::lonnet::getfile($file),'',%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';
+  return OK;
 }
  
 $Apache::lonxml::debug=0;
 sub debug {
   if ($Apache::lonxml::debug eq 1) {
-    print "DEBUG:".$_[0]."<br>\n";
+    print "DEBUG:".$_[0]."<br />\n";
   }
 }
+
 sub error {
-  print "ERROR:".$_[0]."<br>\n";
+  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 "WARNING:".$_[0]."<br>\n";
+    print "<b>W</b>ARNING<b>:</b>".$_[0]."<br />\n";
   }
 }
 
 1;
 __END__
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-