[BACK]Return to portfolio.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/portfolio.pm between versions 1.139 and 1.140

version 1.139, 2006/07/19 21:58:16 version 1.140, 2006/07/30 19:38:13
Line 149  TABLE Line 149  TABLE
 sub display_directory_line {  sub display_directory_line {
     my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class,      my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class,
  $line, $access_controls, $curr_access, $now, $version_flag,   $line, $access_controls, $curr_access, $now, $version_flag,
  $href_location, $url, $current_path, $access_admin_text)=@_;   $href_location, $url, $current_path, $access_admin_text, $versions)=@_;
     # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);       # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     $r->print('<tr class="'.$css_class.'">');      $r->print('<tr class="'.$css_class.'">');
     $r->print($line);      $r->print($line);
Line 221  sub display_directory { Line 221  sub display_directory {
     my @dir_lines;      my @dir_lines;
     my @version_lines;      my @version_lines;
     my %versioned;      my %versioned;
     foreach my $line (sort       foreach my $dir_line (sort 
       {         { 
   my ($afile)=split('&',$a,2);    my ($afile)=split('&',$a,2);
   my ($bfile)=split('&',$b,2);    my ($bfile)=split('&',$b,2);
Line 229  sub display_directory { Line 229  sub display_directory {
       } (@$dir_list)) {        } (@$dir_list)) {
     #$strip holds directory/file name      #$strip holds directory/file name
     #$dom       #$dom 
     my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);       my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); 
     $filename =~ s/\s+$//;      $filename =~ s/\s+$//;
     my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);      my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     if ($version) {      if ($version) {
Line 239  sub display_directory { Line 239  sub display_directory {
        push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);         push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     }      }
     }      }
     foreach my $line (@dir_lines) {      foreach my $dir_line (@dir_lines) {
         my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;          my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);          my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {      if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
        my %version_flag;         my %version_flag;
Line 332  sub display_directory { Line 332  sub display_directory {
  $curr_access = join('+ ',@allaccesses);   $curr_access = join('+ ',@allaccesses);
     }      }
  }   }
                 &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, \%access_controls, $curr_access,                  &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, 
                         $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);                                          \%access_controls, $curr_access,$now, \%version_flag, $href_location, 
 # $r->print('<tr class="'.$css_class.'">');                                          $url, $current_path, $access_admin_text);
 # $r->print($line);  
 # $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');  
 # $r->print('<td>'.$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.  
 #  $filename.'</a></td>');   
 # $r->print('<td>'.$size.'</td>');  
 # $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');  
 # if ($select_mode ne 'true') {  
 #    $r->print('<td><span style="white-space: nowrap">'.  
 #      &mt($curr_access).'&nbsp;&nbsp;&nbsp;');  
 #    $r->print('<a href="'.$url.'?access='.$filename.  
 #      '&amp;currentpath='.$current_path.&group_args().  
 #      '">'.$access_admin_text.'</a></span></td>');  
 # }  
 # $r->print('</tr>'.$/);  
  if ($show_versions) {   if ($show_versions) {
     &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls,       foreach my $dir_line (@version_lines) {
                         $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);          my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
                           my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename);
                           if (($v_fname eq $fname)&&($v_extension eq $extension)) {
               &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size, 
                               $css_class, $line, \%access_controls, $curr_access, $now,
                                \%version_flag, $href_location, $url, $current_path, $access_admin_text, 1);
           }
       }
  }   }
             }              }
         }          }
Removed from v.1.139  
changed lines
  Added in v.1.140

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