--- rat/lonambiguous.pm 2003/09/22 03:02:06 1.10 +++ rat/lonambiguous.pm 2004/12/20 20:13:52 1.13 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to resolve ambiguous file locations # -# $Id: lonambiguous.pm,v 1.10 2003/09/22 03:02:06 www Exp $ +# $Id: lonambiguous.pm,v 1.13 2004/12/20 20:13:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -67,6 +67,15 @@ sub getlost { # ================================================================ Main Handler +sub make_symb { + my ($id)=@_; + my ($mapid,$resid)=split(/\./,$id); + my $map=$bighash{'map_id_'.$mapid}; + my $res=$bighash{'src_'.$id}; + my $symb=&Apache::lonnet::encode_symb($map,$resid,$res); + return $symb; +} + sub handler { my $r=shift; @@ -140,7 +149,12 @@ sub handler { return OK; } } - +# ------------------------------------Encrypted requests go straight to navmaps + if ($ENV{'request.enc'}) { + $r->content_type('text/html'); + $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.'/adm/navmaps'); + return REDIRECT; + } # ------------------------------------------------ Would be standalone resource if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', @@ -151,17 +165,30 @@ sub handler { # ------------------------------------------------------------------- Has ID(s) my @possibilities=split(/\,/,$ids); my $couldbe=''; - map { - if (&Apache::lonnet::allowed('bre',$bighash{'src_'.$_})) { + foreach (@possibilities) { + if ($bighash{'encrypted_'.$_}) { next; } + my $symb=&make_symb($_); + if (&Apache::lonnet::allowed('bre',$bighash{'src_'.$_},$symb)) { if ($couldbe) { $couldbe.=','.$_; } else { $couldbe=$_; } } - } @possibilities; + } if ($couldbe) { @possibilities=split(/\,/,$couldbe); + if ($#possibilities==0) { + my $id=$possibilities[0]; + my $resurl=$bighash{'src_'.$id}; + my $mapurl=$bighash{'map_id_'.(split(/\./,$id))[0]}; + my $symb=&make_symb($id); + $r->content_type('text/html'); + &Apache::lonnet::logthis('http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb); + $r->header_out(Location => + 'http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb); + return REDIRECT; + } if ($#possibilities>0) { # ----------------------------------------------- Okay, really multiple choices $r->content_type('text/html'); @@ -176,24 +203,21 @@ and LON-CAPA has insufficient session in of the resource you meant.

Please click on the instance of the resource you intended to access: -

-

- - - - +

+
 TitleTypePart of ...
+ ENDSTART map { + my $resurl=$bighash{'src_'.$_}; my $mapurl=$bighash{'map_id_'.(split(/\./,$_))[0]}; - $r->print(''); + my $symb=&make_symb($_); + $r->print(''); } @possibilities; - $r->print('
TitlePart of ...
'.$bighash{'title_'.$_}. - ''.$bighash{'type_'.$_}. - ''. - ($mapurl=~/^\/uploaded\//?'':''). - &Apache::lonnet::gettitle($mapurl).' '. - ($mapurl=~/^\/uploaded\//?'':'').'
'. + &Apache::lonnet::gettitle($symb). + ''. + &Apache::lonnet::gettitle($mapurl).' '. + '
'); + $r->print(''); untie(%bighash); return OK; }