--- rat/lonambiguous.pm 2004/12/17 22:40:24 1.11 +++ rat/lonambiguous.pm 2013/11/12 04:47:38 1.25 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to resolve ambiguous file locations # -# $Id: lonambiguous.pm,v 1.11 2004/12/17 22:40:24 albertel Exp $ +# $Id: lonambiguous.pm,v 1.25 2013/11/12 04:47:38 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,11 +25,8 @@ # # 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; @@ -49,6 +46,7 @@ sub cleanup { &Apache::lonnet::logthis('Failed cleanup ambiguous: bighash'); } } + return OK; } # ----------------------------------------------------------- Could not resolve @@ -56,13 +54,11 @@ sub cleanup { sub getlost { my ($r,$errmsg)=@_; $errmsg=&mt($errmsg); - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print( - 'Unknown Error'. - &Apache::loncommon::bodytag('Could not handle ambiguous resource reference'). - $errmsg. - ''); + $r->print(&Apache::loncommon::start_page('Could not handle ambiguous resource reference'). + '
'.$errmsg.'
'. + &Apache::loncommon::end_page()); } # ================================================================ Main Handler @@ -87,21 +83,21 @@ sub handler { # ---------------------------------------------------------- Is this selecting? - if ($ENV{'form.selecturl'}) { + if ($env{'form.selecturl'}) { my $envkey; - if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', + if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db', &GDBM_READER(),0640)) { - foreach $envkey (keys %ENV) { + foreach $envkey (keys %env) { if ($envkey=~/^form\.(\d+)\.(\d+)$/) { # ---------------------------------------------------- Update symb and redirect my $mapid=$1; my $resid=$2; my $resurl=$bighash{'src_'.$mapid.'.'.$resid}; &Apache::lonnet::symblist($bighash{'map_id_'.$mapid}, - $resurl => $resid); + $resurl => [$resurl,$resid]); untie(%bighash); $r->header_out(Location => - 'http://'.$ENV{'HTTP_HOST'}.$resurl); + &Apache::lonnet::absolute_url().$resurl); return REDIRECT; } } @@ -115,7 +111,7 @@ sub handler { # ---------------------------------------------------------- Do we have a case? my $thisfn; - unless (($thisfn=$ENV{'request.ambiguous'})&&($ENV{'request.course.fn'})) { + unless (($thisfn=$env{'request.ambiguous'})&&($env{'request.course.fn'})) { &getlost($r,'Could not find information on resource.'); return OK; } @@ -126,7 +122,7 @@ sub handler { my %hash; my $syval=''; - if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db', + if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', &GDBM_READER(),0640)) { $syval=$hash{$thisfn}; untie(%hash); @@ -135,13 +131,13 @@ sub handler { # ---------------------------------------------------------- There was an entry if ($syval) { - - if ($syval=~/\_$/) { + my ($page,undef,$res)=&Apache::lonnet::decode_symb($syval); + if ($res eq 'page') { # ----------------------------------- Okay, this should have appeared on a page - $syval=~s/\_\_\_$//; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => - 'http://'.$ENV{'HTTP_HOST'}.'/res/'.$syval); + &Apache::lonnet::absolute_url(). + &Apache::lonnet::clutter($page)); return REDIRECT; } else { # There is not really a problem (???), but cannot go back without endless loop @@ -149,10 +145,16 @@ sub handler { return OK; } } - +# ------------------------------------Encrypted requests go straight to navmaps + if ($env{'request.enc'}) { + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => + &Apache::lonnet::absolute_url().'/adm/navmaps'); + return REDIRECT; + } # ------------------------------------------------ Would be standalone resource - if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', + if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db', &GDBM_READER(),0640)) { # ---------------------------------------------- Get ID(s) for current resource my $ids=$bighash{'ids_'.&Apache::lonnet::clutter($thisfn)}; @@ -173,36 +175,62 @@ sub handler { } 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); + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => + &Apache::lonnet::absolute_url(). + $resurl.'?symb='.$symb); + return REDIRECT; + } if ($#possibilities>0) { # ----------------------------------------------- Okay, really multiple choices - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my $bodytag= - &Apache::loncommon::bodytag('Pick Instance of Resource'); - $r->print(<Choose Location -$bodytag -The resource you had been accessing appears more than once in this course, -and LON-CAPA has insufficient session information to determine which instance -of the resource you meant. -

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

- - -ENDSTART + my $start_page= + &Apache::loncommon::start_page('Pick Instance of Resource'); + $r->print( + $start_page + .'

' + .&mt('The resource you had been accessing appears more than' + .' once in this course, and LON-CAPA has insufficient' + .' session information to determine which instance' + .' of the resource you meant.') + .'

' + .'

' + .&mt('Please click on the instance of the resource you' + .' intended to access:') + .'

' + ); + $r->print( + &Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'' + .'' + .&Apache::loncommon::end_data_table_header_row() + .&Apache::loncommon::start_data_table_row() + ); map { - my $resurl=$bighash{'src_'.$_}; + my $resurl=$bighash{'src_'.$_}; my $mapurl=$bighash{'map_id_'.(split(/\./,$_))[0]}; - my $symb=&make_symb($_); - $r->print(''); + my $symb=&make_symb($_); + $r->print( + &Apache::loncommon::start_data_table_row() + .'' + .'' + .&Apache::loncommon::end_data_table_row() + ); } @possibilities; - $r->print('
TitlePart of ...
'.&mt('Title').''.&mt('Part of ...').'
'. - &Apache::lonnet::gettitle($symb). - ''. - &Apache::lonnet::gettitle($mapurl).' '. - '
' + .&Apache::lonnet::gettitle($symb) + .''.&Apache::lonnet::gettitle($mapurl).' 
'); - untie(%bighash); + $r->print( + &Apache::loncommon::end_data_table() + .&Apache::loncommon::end_page() + ); + untie(%bighash); return OK; } } @@ -220,6 +248,40 @@ __END__ +=head1 NAME + +Apache::lonambiguous + +=head1 SYNOPSIS + +Handler to resolve ambiguous file locations. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 HANDLER SUBROUTINE + +make_symb() + +and + +handler() + +=head1 OTHER SUBROUTINES + +=over + +=item * + +cleanup() + +=item * + +getlost() + +=back + +=cut