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

Diff for /rat/lonambiguous.pm between versions 1.12 and 1.15

version 1.12, 2004/12/20 20:13:03 version 1.15, 2005/03/01 00:22:57
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # (TeX Content Handler  
 #  
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)  
 #  
 # 10/11,10/12,10/16 Gerd Kortemeyer  
   
 package Apache::lonambiguous;  package Apache::lonambiguous;
   
Line 56  sub cleanup { Line 51  sub cleanup {
 sub getlost {  sub getlost {
     my ($r,$errmsg)=@_;      my ($r,$errmsg)=@_;
     $errmsg=&mt($errmsg);      $errmsg=&mt($errmsg);
     $r->content_type('text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     $r->print(      $r->print(
  '<head><title>Unknown Error</title></head>'.   '<head><title>Unknown Error</title></head>'.
Line 98  sub handler { Line 93  sub handler {
                  my $resid=$2;                   my $resid=$2;
                  my $resurl=$bighash{'src_'.$mapid.'.'.$resid};                   my $resurl=$bighash{'src_'.$mapid.'.'.$resid};
                  &Apache::lonnet::symblist($bighash{'map_id_'.$mapid},                   &Apache::lonnet::symblist($bighash{'map_id_'.$mapid},
            $resurl => $resid);             $resurl => [$resurl,$resid]);
                  untie(%bighash);                   untie(%bighash);
                  $r->header_out(Location =>                    $r->header_out(Location => 
                                 'http://'.$ENV{'HTTP_HOST'}.$resurl);                                  'http://'.$ENV{'HTTP_HOST'}.$resurl);
Line 135  sub handler { Line 130  sub handler {
 # ---------------------------------------------------------- There was an entry  # ---------------------------------------------------------- There was an entry
   
     if ($syval) {      if ($syval) {
    my ($page,undef,$res)=&Apache::lonnet::decode_symb($syval);
        if ($syval=~/\_$/) {   if ($res eq 'page') {
 # ----------------------------------- Okay, this should have appeared on a page  # ----------------------------------- Okay, this should have appeared on a page
    $syval=~s/\_\_\_$//;     &Apache::loncommon::content_type($r,'text/html');
     $r->content_type('text/html');  
            $r->header_out(Location =>              $r->header_out(Location => 
                 'http://'.$ENV{'HTTP_HOST'}.'/res/'.$syval);    'http://'.$ENV{'HTTP_HOST'}.
     &Apache::lonnet::clutter($page));
            return REDIRECT;             return REDIRECT;
        } else {         } else {
 #  There is not really a problem (???), but cannot go back without endless loop  #  There is not really a problem (???), but cannot go back without endless loop
Line 149  sub handler { Line 144  sub handler {
            return OK;             return OK;
        }         }
     }      }
   # ------------------------------------Encrypted requests go straight to navmaps
      if ($ENV{'request.enc'}) {
          &Apache::loncommon::content_type($r,'text/html');
          $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.'/adm/navmaps');
          return REDIRECT;
      }
 # ------------------------------------------------ Would be standalone resource  # ------------------------------------------------ Would be standalone resource
   
    if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',     if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
Line 177  sub handler { Line 178  sub handler {
  my $resurl=$bighash{'src_'.$id};   my $resurl=$bighash{'src_'.$id};
  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);
  $r->content_type('text/html');   &Apache::loncommon::content_type($r,'text/html');
  &Apache::lonnet::logthis('http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);   &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);     'http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);
Line 185  sub handler { Line 186  sub handler {
     }      }
             if ($#possibilities>0) {              if ($#possibilities>0) {
 # ----------------------------------------------- Okay, really multiple choices  # ----------------------------------------------- Okay, really multiple choices
                $r->content_type('text/html');         &Apache::loncommon::content_type($r,'text/html');
                $r->send_http_header;                 $r->send_http_header;
                my $bodytag=                 my $bodytag=
                       &Apache::loncommon::bodytag('Pick Instance of Resource');                        &Apache::loncommon::bodytag('Pick Instance of Resource');
Removed from v.1.12  
changed lines
  Added in v.1.15

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