Diff for /rat/lonsequence.pm between versions 1.28 and 1.32

version 1.28, 2006/11/02 21:15:22 version 1.32, 2007/12/01 01:59:54
Line 34  use Apache::lonnet; Line 34  use Apache::lonnet;
 use Apache::Constants qw(:common :http REDIRECT);  use Apache::Constants qw(:common :http REDIRECT);
 use GDBM_File;  use GDBM_File;
 use LONCAPA::map();  use LONCAPA::map();
 use Apache::lonratsrv();  
 use Apache::lonpageflip();  use Apache::lonpageflip();
 use Apache::loncommon();  use Apache::loncommon();
   use Apache::groupsort();
 use Apache::lonlocal;  use Apache::lonlocal;
   use HTML::Entities();
   
 my %selhash;  my %selhash;
 my $successtied;  my $successtied;
Line 45  my $successtied; Line 46  my $successtied;
 # ----------------------------------------- Attempt to read from resource space  # ----------------------------------------- Attempt to read from resource space
   
 sub attemptread {  sub attemptread {
     my $fn=shift;      my ($fn,$unsorted)=@_;
     &Apache::lonnet::repcopy($fn);      &Apache::lonnet::repcopy($fn);
     if (-e $fn) {      if (-e $fn) {
  return &LONCAPA::map::attemptread($fn);   return &LONCAPA::map::attemptread($fn,$unsorted);
     } else {      } else {
         return ();          return ();
     }      }
Line 114  ENDSELECT Line 115  ENDSELECT
             $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 'import') {      if ($env{'form.catalogmode'} eq 'import') {
     my $acts=$env{'form.acts'};   &Apache::groupsort::update_actions_hash(\%selhash);
     my @Acts=split(/b/,$acts);  
     my %ahash;  
     my %achash;  
     my $ac=0;  
     # some initial hashes for working with data  
     foreach (@Acts) {  
  my ($state,$ref)=split(/a/);  
  $ahash{$ref}=$state;  
  $achash{$ref}=$ac;  
  $ac++;  
     }  
     # sorting through the actions and changing the tied database hash  
     foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {  
  my $key=$_;  
  if ($ahash{$key} eq '1') {  
     $selhash{'store_'.$selhash{'pre_'.$key.'_link'}}=  
  $selhash{'pre_'.$key.'_title'};  
     $selhash{'storectr_'.$selhash{'pre_'.$key.'_link'}}=  
  $selhash{'storectr'}+0;  
     $selhash{'storectr'}++;  
  }  
  if ($ahash{$key} eq '0') {  
     if ($selhash{'store_'.$selhash{'pre_'.$key.'_link'}}) {  
        delete $selhash{'store_'.$selhash{'pre_'.$key.'_link'}};  
     }  
  }  
     }  
     # deleting the previously cached listing  
     foreach (keys %selhash) {  
  if ($_ =~ /^pre_/ && $_ =~/link$/) {  
     my $key = $_;  
     $key =~ s/^pre_//;  
     $key =~ s/_[^_]*$//;  
     delete $selhash{'pre_'.$key.'_title'};  
     delete $selhash{'pre_'.$key.'_link'};  
  }  
     }      }
  }  
 # -  # -
         }          }
     }      }
Line 170  ENDSELECT Line 134  ENDSELECT
  $r->print('<form name="form'.$idx.'">');   $r->print('<form name="form'.$idx.'">');
             }              }
     my ($title,$url)=split(/\:/,$_);      my ($title,$url)=split(/\:/,$_);
             $title=~s/\&colon\;/\:/g;      $title = &LONCAPA::map::qtescape($title);
             $url=~s/\&colon\;/\:/g;      unless ($title) { $title=(split(/\//,$url))[-1] };
             unless ($title) { $title=(split(/\//,$url))[-1] };              my $enc_title = &HTML::Entities::encode($title,'\'"<>&');
             unless ($title) { $title='<i>'.&mt('Empty').'</i>'; }      unless ($title) {
    $title='<i>'.&mt('Empty').'</i>';
    $enc_title = &mt('Empty');
       }
       $url  = &LONCAPA::map::qtescape($url);
               my $enc_url = &HTML::Entities::encode($url,'\'"<>&');
             if ($url) {              if ($url) {
  if ($successtied) {   if ($successtied) {
     my $checked='';      my $checked='';
Line 182  ENDSELECT Line 151  ENDSELECT
            }             }
            $selhash{"pre_${idx}_link"}=$url;             $selhash{"pre_${idx}_link"}=$url;
            $selhash{"pre_${idx}_title"}=$title;             $selhash{"pre_${idx}_title"}=$title;
       
       $url  = &HTML::Entities::encode($url, '\'"<>&');
     $r->print(<<ENDCHECKBOX);      $r->print(<<ENDCHECKBOX);
 <input type='checkbox' name='filelink'   <input type='checkbox' name='filelink' 
 value='$url' onClick='javascript:queue("form$idx")'$checked>  value='$enc_url' onClick='javascript:queue("form$idx")'$checked />
 <input type='hidden' name='title' value='$title'>  <input type='hidden' name='title' value='$enc_title' />
 ENDCHECKBOX  ENDCHECKBOX
                 }                  }
  $r->print('<a href="'.&Apache::lonratsrv::qtescape($url).'">');   $r->print('<a href="'.$enc_url.'">');
             }              }
             $r->print(&Apache::lonratsrv::qtescape($title));              $r->print($enc_title);
             if ($url) { $r->print('</a>'); }              if ($url) { $r->print('</a>'); }
             if ($successtied) {              if ($successtied) {
  $r->print('</form>');   $r->print('</form>');

Removed from v.1.28  
changed lines
  Added in v.1.32


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