--- rat/lonsequence.pm 2004/10/16 01:14:28 1.21 +++ rat/lonsequence.pm 2006/04/04 15:32:12 1.26 @@ -2,7 +2,7 @@ # # Sequence Handler # -# $Id: lonsequence.pm,v 1.21 2004/10/16 01:14:28 albertel Exp $ +# $Id: lonsequence.pm,v 1.26 2006/04/04 15:32:12 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,13 +28,6 @@ # # (Handler to resolve ambiguous file locations # -# (TeX Content Handler -# -# 05/29/00,05/30,10/11 Gerd Kortemeyer) -# -# 10/11,10/12 Gerd Kortemeyer) -# -# 10/16 Gerd Kortemeyer package Apache::lonsequence; @@ -77,9 +70,11 @@ sub mapread { sub viewmap { my ($r,$url)=@_; - $r->print(''); - if ($ENV{'form.forceselect'}) { $r->print(< + + my $js; + if ($env{'form.forceselect'}) { + $js = (< function select_group() { window.location="/adm/groupsort?catalogmode=groupsec&mode=rat&acts="+document.forms.fileattr.acts.value; @@ -101,9 +96,11 @@ function queue(val) { ENDSCRIPT } - $r->print(&Apache::loncommon::bodytag('Map Contents').'

'.$url.'

'); + + $r->print(&Apache::loncommon::start_page('Map Contents',$js). + '

'.$url.'

'); # ------------------ This is trying to select. Provide buttons and tie %selhash - if ($ENV{'form.forceselect'}) { $r->print(<print(< ENDSELECT my $diropendb = - "/home/httpd/perl/tmp/$ENV{'user.domain'}\_$ENV{'user.name'}_groupsec.db"; + "/home/httpd/perl/tmp/$env{'user.domain'}\_$env{'user.name'}_groupsec.db"; if (tie(%selhash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) { - if ($ENV{'form.launch'} eq '1') { + if ($env{'form.launch'} eq '1') { &start_fresh_session(); } $successtied=1; # - Evaluate actions from previous page (both cumulatively and chronologically) - if ($ENV{'form.catalogmode'} eq 'groupimport') { - my $acts=$ENV{'form.acts'}; + if ($env{'form.catalogmode'} eq 'groupimport') { + my $acts=$env{'form.acts'}; my @Acts=split(/b/,$acts); my %ahash; my %achash; @@ -205,7 +202,7 @@ ENDCHECKBOX } } } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); if ($successtied) { untie %selhash; } @@ -249,9 +246,9 @@ sub handler { my $exitdisid = ''; my $arrow_dir = ''; - if (($ENV{'request.course.fn'}) && (!$ENV{'form.forceselect'})) { + if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) { my $last; - 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)) { $last=$hash{'last_direction'}; untie(%hash); @@ -259,10 +256,10 @@ sub handler { my $direction=''; my $prevmap=''; if ($last) { - ($prevmap,$direction)=(split(/\_\_\_/,$last)); + ($prevmap,undef,$direction)=&Apache::lonnet::decode_symb($last); } # ------------------------------------------------------------- Tie big db file - if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', + if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db', &GDBM_READER(),0640)) { my $disid=''; my $randomout =''; @@ -275,8 +272,10 @@ sub handler { if ($disid) { $disurl=$bighash{'src_'.$disid}; $dismapid=(split(/\./,$disid))[1]; - $randomout = $bighash{'randomout_'.$disid}; - } elsif (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db', + if (!$env{'request.role.adv'}) { + $randomout = $bighash{'randomout_'.$disid}; + } + } elsif (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', &GDBM_READER(),0640)) { $last=$hash{'last_known'}; untie(%hash); @@ -292,7 +291,9 @@ sub handler { if ($disid) { $disurl=$bighash{'src_'.$disid}; $dismapid=(split(/\./,$disid))[1]; - $randomout = $bighash{'randomout_'.$disid}; + if (!$env{'request.role.adv'}) { + $randomout = $bighash{'randomout_'.$disid}; + } } } $exitdisid = $disid; @@ -306,8 +307,8 @@ sub handler { # now either disurl is set (going to first page), or we need another display if ($disurl) { # -------------------------------------------------- Has first or last resource - &Apache::lonnet::symblist($requrl,$disurl => $dismapid, - 'last_known' => &Apache::lonnet::declutter($disurl)); + &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid], + 'last_known' => [$disurl,$dismapid]); &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.$disurl); return REDIRECT; @@ -318,30 +319,30 @@ sub handler { my %lt =&Apache::lonlocal::texthash( 'back' => 'beginning', 'forward' => 'end', - 'emfo' => 'Empty Folder/Sequence', 'nere' => 'Next resource could not be displayed', 'goba' => 'Go Back', 'nacc' => 'Navigate Course Content', ); - my $warnmsg = 'As all folders and sequences '; + my $warnmsg = &mt('As all folders and sequences '); if ($arrow_dir eq 'forward') { $warnmsg .= &mt('following the current resource were empty').','; } elsif ($arrow_dir eq 'back') { $warnmsg .= &mt('preceding the current resource were empty').','; } $warnmsg .= &mt('you have now reached the').' '.$lt{$arrow_dir}.' '.&mt('of the course.'); - my $bodytag=&Apache::loncommon::bodytag('Empty Folder/Sequence'); + my $start_page= + &Apache::loncommon::start_page('Empty Folder/Sequence'); + my $end_page= + &Apache::loncommon::end_page(); $r->print(<$lt{'emfo'} -$bodytag +$start_page

$lt{'nere'}

$warnmsg

- - +$end_page ENDNONE } else { &viewmap($r,$requrl);