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

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 11 Apr 2006 14:17:23 -0000


albertel		Tue Apr 11 10:17:23 2006 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
    /loncom/interface	lonmsg.pm 
  Log:
  - adding machine that cuased the error to be added to the error message
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.403 loncom/xml/lonxml.pm:1.404
--- loncom/xml/lonxml.pm:1.403	Tue Apr 11 10:07:33 2006
+++ loncom/xml/lonxml.pm	Tue Apr 11 10:17:06 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.403 2006/04/11 14:07:33 albertel Exp $
+# $Id: lonxml.pm,v 1.404 2006/04/11 14:17:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1580,8 +1580,7 @@
 	    #public or browsers
 	    $errormsg=&mt("An error occured while processing this resource. The author has been notified.");
 	}
-	my $msg = join('<br />',@_)." <p>this error occurred on machine ".
-	    $perlvar{'lonHostID'}."</p>";
+	my $msg = join('<br />',@_);
 	#notify author
 	&Apache::lonmsg::author_res_msg($env{'request.filename'},$msg);
 	#notify course
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.180 loncom/interface/lonmsg.pm:1.181
--- loncom/interface/lonmsg.pm:1.180	Sat Apr  8 02:53:37 2006
+++ loncom/interface/lonmsg.pm	Tue Apr 11 10:17:23 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.180 2006/04/08 06:53:37 albertel Exp $
+# $Id: lonmsg.pm,v 1.181 2006/04/11 14:17:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -278,6 +278,8 @@
     my $homeserver=&Apache::lonnet::homeserver($author,$domain);
     if ($homeserver ne 'no_host') {
        my $id=unpack("%32C*",$message);
+       $message .= " <p>This error occurred on machine ".
+	   $Apache::lonnet::perlvar{'lonHostID'}."</p>";
        my $msgid;
        ($msgid,$message)=&packagemsg($filename,$message);
        return &Apache::lonnet::reply('put:'.$domain.':'.$author.