--- loncom/xml/lonxml.pm	2001/01/06 15:31:27	1.45
+++ loncom/xml/lonxml.pm	2001/02/19 20:40:55	1.54
@@ -13,7 +13,7 @@ use HTML::TokeParser;
 use Safe;
 use Safe::Hole;
 use Opcode;
-use Apache::Constants(:common);
+use Apache::Constants qw(:common);
 
 sub register {
   my $space;
@@ -24,7 +24,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;
@@ -44,10 +50,14 @@ sub xmlparse {
  if ($target eq 'meta') {
    $Apache::lonxml::textredirection = 0;
    $Apache::lonxml::on_offimport = 1;
+ } elsif ($target eq 'grade') {
+   $Apache::lonxml::textredirection = 0;
+   $Apache::lonxml::on_offimport = 0;
  } else {
    $Apache::lonxml::textredirection = 1;
    $Apache::lonxml::on_offimport = 0;
  }
+ #&printalltags();
  my @pars = ();
  @Apache::lonxml::pwd=();
  my $pwd=$ENV{'request.filename'};
@@ -110,7 +120,7 @@ sub xmlparse {
        #clear out any tags that didn't end
        while ($token->[1] ne $stack[$#stack] 
 	      && ($#stack > -1)) {
-	 &Apache::lonxml::error("Unbalanced tags in resource $stack['-1']");   
+	 &Apache::lonxml::warning("Unbalanced tags in resource $stack['-1']");   
 	 pop @stack;pop @parstack;&decreasedepth($token);
        }
        
@@ -184,7 +194,7 @@ sub recurse {
 	#clear out any tags that didn't end
 	while ($tokenpat->[1] ne $innerstack[$#innerstack] 
 	       && ($#innerstack > -1)) {
-	  &Apache::lonxml::error("Unbalanced tags in resource $innerstack['-1']");
+	  &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
 	  pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
 	}
 	$partstring = &callsub("end_$tokenpat->[1]",
@@ -226,13 +236,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 {
@@ -259,7 +269,7 @@ sub increasedepth {
   }
   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";
+#print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
 }
 
 sub decreasedepth {
@@ -270,12 +280,12 @@ sub decreasedepth {
     $Apache::lonxml::olddepth=$Apache::lonxml::depth+1;
   }
   if (  $Apache::lonxml::depth < -1) {
-    &Apache::lonxml::error("Unbalanced tags in resource");   
+    &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";
+#print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
 }
 
 sub get_all_text {
@@ -285,8 +295,9 @@ sub get_all_text {
  my $token;
  my $result='';
  my $tag=substr($tag,1); #strip the / off the tag
-# &Apache::lonxml::debug("have:$tag:");
+ #&Apache::lonxml::debug("have:$tag:");
  while (($depth >=0) && ($token = $pars->get_token)) {
+   #&Apache::lonxml::debug("token:$token->[0]:$depth:$token->[1]");
    if ($token->[0] eq 'T') {
      $result.=$token->[1];
    } elsif ($token->[0] eq 'S') {
@@ -300,6 +311,7 @@ sub get_all_text {
      }
    }
  }
+# &Apache::lonxml::debug("Exit:$result:");
  return $result
 }
 
@@ -321,7 +333,8 @@ sub parstring {
   map {
     unless ($_=~/\W/) {
       my $val=$token->[2]->{$_};
-      if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
+      $val =~ s/([\%\@\\])/\\$1/g;
+      #if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
       $temp .= "my \$$_=\"$val\";"
     }
   } @{$token->[3]};
@@ -343,7 +356,7 @@ 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 {
@@ -366,12 +379,19 @@ sub handler {
 
   $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);
@@ -381,35 +401,37 @@ sub handler {
 $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 "ERROR:".$_[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 "WARNING:".$_[0]."<br />\n";
   }
 }
 
 1;
 __END__
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-