loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.636.2.3 and 1.636.2.6

-version 1.636.2.3, 2008/03/18 23:00:51
+version 1.636.2.6, 2008/04/04 16:48:42
  Line 78  my $readit;
  ## Global Variables
  ##
+ # ----------------------------------------------- SSI with retries:
+ #
+ =pod
+ =head1 Server Side include with retries:
+ =over 4
+ =item * &ssi_with_retries(resource,retries form)
+ Performs an ssi with some number of retries.  Retries continue either
+ until the result is ok or until the retry count supplied by the
+ caller is exhausted.
+ Inputs:
+ =over 4
+ resource   - Identifies the resource to insert.
+ retries    - Count of the number of retries allowed.
+ form       - Hash that identifies the rendering options.
+ =back
+ Returns:
+ =over 4
+ content    - The content of the response.  If retries were exhausted this is empty.
+ response   - The response from the last attempt (which may or may not have been successful.
+ =back
+ =back
+ =cut
+ sub ssi_with_retries {
+     my ($resource, $retries, %form) = @_;
+     my $ok = 0;                 # True if we got a good response.
+     my $content;
+     my $response;
+     # Try to get the ssi done. within the retries count:
+     do {
+         ($content, $response) = &Apache::lonnet::ssi($resource, %form);
+         $ok      = $response->is_success;
+         if (!$ok) {
+             &Apache::lonnet::logthis("Failed ssi_with_retries on $resource: ".$response->is_success.', '.$response->code.', '.$response->message);
+         }
+         $retries--;
+     } while (!$ok && ($retries > 0));
+     if (!$ok) {
+         $content = '';          # On error return an empty content.
+     }
+     return ($content, $response);
+ }
  # ----------------------------------------------- Filetypes/Languages/Copyright
  my %language;
  my %supported_language;
- Line 3110  sub get_student_view {
+ Line 3179  sub get_student_view {
    }
    if (defined($target)) { $form{'grade_target'} = $target; }
    $feedurl=&Apache::lonnet::clutter($feedurl);
-   my $userview=&Apache::lonnet::ssi_body($feedurl,%form);
+   my ($userview,$response)=&Apache::lonnet::ssi_body($feedurl,%form);
    $userview=~s/\<body[^\>]*\>//gi;
    $userview=~s/\<\/body\>//gi;
    $userview=~s/\<html\>//gi;
- Line 3119  sub get_student_view {
+ Line 3188  sub get_student_view {
    $userview=~s/\<\/head\>//gi;
    $userview=~s/action\s*\=/would_be_action\=/gi;
    $userview=&relative_to_absolute($feedurl,$userview);
-   return $userview;
+   if (wantarray) {
+       return ($userview,$response);
+   } else {
+       return $userview;
+   }
+ }
+ sub get_student_view_with_retries {
+     my ($symb,$retries,$username,$domain,$courseid,$target,$moreenv) = @_;
+     my $ok = 0;                 # True if we got a good response.
+     my $content;
+     my $response;
+     # Try to get the student_view done. within the retries count:
+     do {
+         ($content, $response) = &get_student_view($symb,$username,$domain,$courseid,$target,$moreenv);
+         $ok = $response->is_success;
+         if (!$ok) {
+             &Apache::lonnet::logthis("Failed get_student_view_with_retries on $symb: ".$response->is_success.', '.$response->code.', '.$response->message);
+         }
+         $retries--;
+     } while (!$ok && ($retries > 0));
+     if (!$ok) {
+         $content = '';          # On error return an empty content.
+     }
+     if (wantarray) {
+         return ($content, $response);
+     } else {
+         return $content;
+     }
  }
  =pod
- Line 3981  ENDROLE
+ Line 4082  ENDROLE
          $dc_info = '('.$dc_info.')';
      }
-     if ($env{'environment.remote'} eq 'off') {
+     if (($env{'environment.remote'} eq 'off') || ($args->{'suppress_header_logos'})) {
          # No Remote
  	if ($env{'request.state'} eq 'construct') {
  	    $forcereg=1;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.636.2.3
changed lines
	Added in v.1.636.2.6