Diff for /rat/lonsequence.pm between versions 1.19 and 1.24

version 1.19, 2004/08/29 16:30:53 version 1.24, 2005/04/07 06:56:27
Line 28 Line 28
 #  #
 # (Handler to resolve ambiguous file locations  # (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;  package Apache::lonsequence;
   
Line 78  sub mapread { Line 71  sub mapread {
 sub viewmap {  sub viewmap {
     my ($r,$url)=@_;      my ($r,$url)=@_;
     $r->print('<html>');      $r->print('<html>');
     if ($ENV{'form.forceselect'}) { $r->print(<<ENDSCRIPT);      if ($env{'form.forceselect'}) { $r->print(<<ENDSCRIPT);
 <script>  <script>
   
 function select_group() {  function select_group() {
Line 103  ENDSCRIPT Line 96  ENDSCRIPT
     }      }
     $r->print(&Apache::loncommon::bodytag('Map Contents').'<h1>'.$url.'</h1>');      $r->print(&Apache::loncommon::bodytag('Map Contents').'<h1>'.$url.'</h1>');
 # ------------------ This is trying to select. Provide buttons and tie %selhash  # ------------------ This is trying to select. Provide buttons and tie %selhash
     if ($ENV{'form.forceselect'}) { $r->print(<<ENDSELECT);      if ($env{'form.forceselect'}) { $r->print(<<ENDSELECT);
 <form name=fileattr><input type=hidden name=acts value=''>  <form name=fileattr><input type=hidden name=acts value=''>
 <input type="button" name="close" value='CLOSE' onClick="self.close()">  <input type="button" name="close" value='CLOSE' onClick="self.close()">
 <input type="button" name="groupimport" value='GROUP IMPORT'  <input type="button" name="groupimport" value='GROUP IMPORT'
Line 111  onClick="javascript:select_group()"> Line 104  onClick="javascript:select_group()">
 </form>     </form>   
 ENDSELECT  ENDSELECT
     my $diropendb =       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 (tie(%selhash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
     if ($ENV{'form.launch'} eq '1') {      if ($env{'form.launch'} eq '1') {
        &start_fresh_session();         &start_fresh_session();
     }      }
             $successtied=1;              $successtied=1;
   
 # - Evaluate actions from previous page (both cumulatively and chronologically)  # - Evaluate actions from previous page (both cumulatively and chronologically)
         if ($ENV{'form.catalogmode'} eq 'groupimport') {          if ($env{'form.catalogmode'} eq 'groupimport') {
     my $acts=$ENV{'form.acts'};      my $acts=$env{'form.acts'};
     my @Acts=split(/b/,$acts);      my @Acts=split(/b/,$acts);
     my %ahash;      my %ahash;
     my %achash;      my %achash;
Line 249  sub handler { Line 242  sub handler {
   my $exitdisid = '';    my $exitdisid = '';
   my $arrow_dir = '';    my $arrow_dir = '';
   
   if (($ENV{'request.course.fn'}) && (!$ENV{'form.forceselect'})) {    if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) {
        my $last;         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)) {                      &GDBM_READER(),0640)) {
    $last=$hash{'last_direction'};     $last=$hash{'last_direction'};
            untie(%hash);             untie(%hash);
Line 259  sub handler { Line 252  sub handler {
        my $direction='';         my $direction='';
        my $prevmap='';         my $prevmap='';
        if ($last) {         if ($last) {
   ($prevmap,$direction)=(split(/\_\_\_/,$last));     ($prevmap,undef,$direction)=&Apache::lonnet::decode_symb($last);
        }         }
 # ------------------------------------------------------------- Tie big db file  # ------------------------------------------------------------- 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)) {                      &GDBM_READER(),0640)) {
    my $disid='';     my $disid='';
            my $randomout ='';             my $randomout ='';
Line 276  sub handler { Line 269  sub handler {
        $disurl=$bighash{'src_'.$disid};         $disurl=$bighash{'src_'.$disid};
                $dismapid=(split(/\./,$disid))[1];                 $dismapid=(split(/\./,$disid))[1];
                $randomout = $bighash{'randomout_'.$disid};                 $randomout = $bighash{'randomout_'.$disid};
            } elsif (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',             } elsif (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
                     &GDBM_READER(),0640)) {                      &GDBM_READER(),0640)) {
                $last=$hash{'last_known'};                 $last=$hash{'last_known'};
                untie(%hash);                 untie(%hash);
Line 306  sub handler { Line 299  sub handler {
 # now either disurl is set (going to first page), or we need another display  # now either disurl is set (going to first page), or we need another display
    if ($disurl) {     if ($disurl) {
 # -------------------------------------------------- Has first or last resource  # -------------------------------------------------- Has first or last resource
       &Apache::lonnet::symblist($requrl,$disurl => $dismapid,        &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid],
                    'last_known' => &Apache::lonnet::declutter($disurl));    'last_known' => [$disurl,$dismapid]); 
       &Apache::loncommon::content_type($r,'text/html');        &Apache::loncommon::content_type($r,'text/html');
       $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.$disurl);        $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.$disurl);
       return REDIRECT;        return REDIRECT;
    } else {     } else {
        &Apache::loncommon::content_type($r,'text/html');         &Apache::loncommon::content_type($r,'text/html');
        $r->send_http_header;         $r->send_http_header;
        if ($exitdisid eq '') {         if ($exitdisid eq '' && $arrow_dir ne '') {
            my %lt =&Apache::lonlocal::texthash(             my %lt =&Apache::lonlocal::texthash(
                    'back' => 'beginning',                     'back' => 'beginning',
                    'forward' => 'end',                     'forward' => 'end',
Line 330  sub handler { Line 323  sub handler {
                $warnmsg .= &mt('preceding the current resource were empty').',';                 $warnmsg .= &mt('preceding the current resource were empty').',';
            }             }
            $warnmsg .= &mt('you have now reached the').' '.$lt{$arrow_dir}.' '.&mt('of the course.');             $warnmsg .= &mt('you have now reached the').' '.$lt{$arrow_dir}.' '.&mt('of the course.');
            my $bodytag=&Apache::loncommon::bodytag(&mt('emfo'));             my $bodytag=&Apache::loncommon::bodytag('Empty Folder/Sequence');
            $r->print(<<ENDNONE);             $r->print(<<ENDNONE);
 <head><title>$lt{'emfo'}</title></head>  <head><title>$lt{'emfo'}</title></head>
 $bodytag  $bodytag

Removed from v.1.19  
changed lines
  Added in v.1.24


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