--- loncom/homework/grades.pm 2008/03/24 19:14:07 1.513.2.2
+++ loncom/homework/grades.pm 2008/03/17 20:39:50 1.515
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.513.2.2 2008/03/24 19:14:07 raeburn Exp $
+# $Id: grades.pm,v 1.515 2008/03/17 20:39:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -73,7 +73,7 @@ my $ssi_error_message;
# the number of times requested by the caller.
# If we still have a proble, no text is appended to the
# output and we set some global variables.
-# to indicate to the caller an SSI error occurred.
+# to indicate to the caller an SSI error occured.
# All of this is supposed to deal with the issues described
# in LonCAPA BZ 5631 see:
# http://bugs.lon-capa.org/show_bug.cgi?id=5631
@@ -89,13 +89,13 @@ my $ssi_error_message;
# On success, returns the rendered resource identified by the resource parameter.
# Side Effects:
# The following global variables can be set:
-# ssi_error - If an unrecoverable error occurred this becomes true.
+# ssi_error - If an unrecoverable error occured this becomes true.
# It is up to the caller to initialize this to false
# if desired.
-# ssi_error_resource - If an unrecoverable error occurred, this is the value
+# ssi_last_error_resource - If an unrecoverable error occured, this is the value
# of the resource that could not be rendered by the ssi
# call.
-# ssi_error_message - The error string fetched from the ssi response
+# ssi_last_error - The error string fetched from the ssi response
# in the event of an error.
#
sub ssi_with_retries {
@@ -116,20 +116,11 @@ sub ssi_with_retries {
sub ssi_print_error {
my ($r) = @_;
- my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
- $r->print('
-
-
-'.&mt('Unable to retrieve a resource from a server:').'
-'.&mt('Resource:').' '.$ssi_error_resource.'
-'.&mt('Error:').' '.$ssi_error_message.'
-
'.
-&mt('It is recommended that you try again later, as this error may mean the server was just temporarily unavailable, or is down for maintenance.').'
'.
-&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).
-'
Unable to perform a resource fetch from a server:
');
+ $r->print("Resource: $ssi_error_resource
");
+ $r->print("Error: $ssi_error_message
Try again later.");
+ $r->print('If errors persist, contact LonCAPA support for assistance