[LON-CAPA-cvs] cvs: loncom /xml lonxml.pm

[albertel]

albertel		Thu Feb  5 16:00:15 2004 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
  Log:
  - print seems to not work in Apache 1 on Fedora, switching to $request->print
    (One might argue that it always should have been thus.)
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.299 loncom/xml/lonxml.pm:1.300
--- loncom/xml/lonxml.pm:1.299	Fri Jan 30 12:27:34 2004
+++ loncom/xml/lonxml.pm	Thu Feb  5 16:00:15 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.299 2004/01/30 17:27:34 sakharuk Exp $
+# $Id: lonxml.pm,v 1.300 2004/02/05 21:00:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1296,19 +1296,23 @@
 sub debug {
     if ($Apache::lonxml::debug eq "1") {
 	$|=1;
-	Apache->request->print('<font size="-2"<pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");
+	my $request=$Apache::lonxml::request;
+	if (!$request) { $request=Apache->request; }
+	$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");
     }
 }
 
 sub error {
   $errorcount++;
+  my $request=$Apache::lonxml::request;
+  if (!$request) { $request=Apache->request; }
   if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
     # If printing in construction space, put the error inside <pre></pre>
-      print $Apache::lonxml::warnings_error_header.
-	  "<b>ERROR:</b>".join("\n",@_)."\n";
+      $request->print($Apache::lonxml::warnings_error_header.
+		      "<b>ERROR:</b>".join("\n",@_)."\n");
       $Apache::lonxml::warnings_error_header='';
   } else {
-    print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";
+    $request->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'},join('<br />',@_));
     #notify course
@@ -1333,8 +1337,10 @@
   
     if ($ENV{'form.grade_target'} ne 'tex') {
 	if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {
-	    print $Apache::lonxml::warnings_error_header.
-		"<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
+	    my $request=$Apache::lonxml::request;
+	    if (!$request) { $request=Apache->request; }
+	    $request->print($Apache::lonxml::warnings_error_header.
+		      "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n");
 	    $Apache::lonxml::warnings_error_header='';
 	}
     }