[BACK]Return to lonambiguous.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / rat

Diff for /rat/lonambiguous.pm between versions 1.17 and 1.21

version 1.17, 2006/02/07 19:46:08 version 1.21, 2006/09/19 19:03:27
Line 54  sub getlost { Line 54  sub getlost {
     $errmsg=&mt($errmsg);      $errmsg=&mt($errmsg);
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     $r->print(      $r->print(&Apache::loncommon::start_page('Could not handle ambiguous resource reference').
  '<head><title>Unknown Error</title></head>'.        $errmsg.
   &Apache::loncommon::bodytag('Could not handle ambiguous resource reference').        &Apache::loncommon::end_page());
   $errmsg.  
  '</body></html>');  
 }  }
   
 # ================================================================ Main Handler  # ================================================================ Main Handler
Line 97  sub handler { Line 95  sub handler {
            $resurl => [$resurl,$resid]);             $resurl => [$resurl,$resid]);
                  untie(%bighash);                   untie(%bighash);
                  $r->header_out(Location =>                    $r->header_out(Location => 
                                 'http://'.$ENV{'HTTP_HOST'}.$resurl);   &Apache::lonnet::absolute_url().$resurl);
                  return REDIRECT;                   return REDIRECT;
              }               }
   }    }
Line 136  sub handler { Line 134  sub handler {
 # ----------------------------------- Okay, this should have appeared on a page  # ----------------------------------- Okay, this should have appeared on a page
    &Apache::loncommon::content_type($r,'text/html');     &Apache::loncommon::content_type($r,'text/html');
            $r->header_out(Location =>              $r->header_out(Location => 
   'http://'.$ENV{'HTTP_HOST'}.    &Apache::lonnet::absolute_url().
   &Apache::lonnet::clutter($page));    &Apache::lonnet::clutter($page));
            return REDIRECT;             return REDIRECT;
        } else {         } else {
Line 148  sub handler { Line 146  sub handler {
 # ------------------------------------Encrypted requests go straight to navmaps  # ------------------------------------Encrypted requests go straight to navmaps
    if ($env{'request.enc'}) {     if ($env{'request.enc'}) {
        &Apache::loncommon::content_type($r,'text/html');         &Apache::loncommon::content_type($r,'text/html');
        $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.'/adm/navmaps');         $r->header_out(Location => 
         &Apache::lonnet::absolute_url().'/adm/navmaps');
        return REDIRECT;         return REDIRECT;
    }     }
 # ------------------------------------------------ Would be standalone resource  # ------------------------------------------------ Would be standalone resource
Line 180  sub handler { Line 179  sub handler {
  my $mapurl=$bighash{'map_id_'.(split(/\./,$id))[0]};   my $mapurl=$bighash{'map_id_'.(split(/\./,$id))[0]};
  my $symb=&make_symb($id);   my $symb=&make_symb($id);
  &Apache::loncommon::content_type($r,'text/html');   &Apache::loncommon::content_type($r,'text/html');
  &Apache::lonnet::logthis('http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);  
  $r->header_out(Location =>    $r->header_out(Location => 
    'http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);         &Apache::lonnet::absolute_url().
          $resurl.'?symb='.$symb);
  return REDIRECT;   return REDIRECT;
     }      }
             if ($#possibilities>0) {              if ($#possibilities>0) {
 # ----------------------------------------------- Okay, really multiple choices  # ----------------------------------------------- Okay, really multiple choices
        &Apache::loncommon::content_type($r,'text/html');         &Apache::loncommon::content_type($r,'text/html');
                $r->send_http_header;                 $r->send_http_header;
                my $bodytag=                 my $start_page=
                       &Apache::loncommon::bodytag('Pick Instance of Resource');     &Apache::loncommon::start_page('Pick Instance of Resource');
                $r->print(<<ENDSTART);                 $r->print(<<ENDSTART);
 <head><title>Choose Location</title></head>  $start_page
 $bodytag  
 The resource you had been accessing appears more than once in this course,  The resource you had been accessing appears more than once in this course,
 and LON-CAPA has insufficient session information to determine which instance  and LON-CAPA has insufficient session information to determine which instance
 of the resource you meant.  of the resource you meant.
Line 213  ENDSTART Line 211  ENDSTART
      &Apache::lonnet::gettitle($mapurl).'&nbsp;'.       &Apache::lonnet::gettitle($mapurl).'&nbsp;'.
      '</td></tr>');       '</td></tr>');
                } @possibilities;                 } @possibilities;
                $r->print('</table></body></html>');                 $r->print('</table>'.&Apache::loncommon::end_page());
        untie(%bighash);         untie(%bighash);
                return OK;                 return OK;
             }              }
Removed from v.1.17  
changed lines
  Added in v.1.21

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