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

[raeburn]

raeburn		Thu Dec 11 22:19:45 2008 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/xml	lonxml.pm 
  Log:
  - Backport 1.486, 1.490.
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.484 loncom/xml/lonxml.pm:1.484.4.1
--- loncom/xml/lonxml.pm:1.484	Fri Aug  8 16:50:39 2008
+++ loncom/xml/lonxml.pm	Thu Dec 11 22:19:45 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.484 2008/08/08 16:50:39 bisitz Exp $
+# $Id: lonxml.pm,v 1.484.4.1 2008/12/11 22:19:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -658,6 +658,7 @@
   $Apache::lonxml::request=$request;
   $errorcount=0;
   $warningcount=0;
+  $Apache::lonxml::internal_error=0;
   $Apache::lonxml::default_homework_loaded=0;
   $Apache::lonxml::usestyle=1;
   &init_counter();
@@ -1828,6 +1829,8 @@
 
     $errorcount++;
 
+    $Apache::lonxml::internal_error=1;
+
     if (defined($Apache::inputtags::part)) {
 	if ( @Apache::inputtags::response ) {
 	    push(@errors,
@@ -1854,7 +1857,7 @@
 	my ($symb)=&Apache::lonnet::symbread();
 	if ( !$symb ) {
 	    #public or browsers
-	    $errormsg=&mt("An error occured while processing this resource. The author has been notified.");
+	    $errormsg=&mt("An error occurred while processing this resource. The author has been notified.");
 	}
 	my $host=$Apache::lonnet::perlvar{'lonHostID'};
 	push(@errors,
@@ -1893,9 +1896,9 @@
 		}
 	    }
 	    if ($env{'request.role.adv'}) {
-		$errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
+		$errormsg=&mt("An error occurred while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
 	    } else {
-		$errormsg=&mt("An error occured while processing this resource. The instructor has been notified.");
+		$errormsg=&mt("An error occurred while processing this resource. The instructor has been notified.");
 	    }
 	}
 	push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");