Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.572 and 1.573

version 1.572, 2004/12/04 02:14:19 version 1.573, 2004/12/04 18:35:27
Line 3817  sub mark_as_readonly { Line 3817  sub mark_as_readonly {
 sub save_selected_files {  sub save_selected_files {
     my ($user, $path, @files) = @_;      my ($user, $path, @files) = @_;
     my $filename = $user."savedfiles";      my $filename = $user."savedfiles";
     open OUT, '>'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename;      my @other_files = &files_not_in_path($user, $path);
       foreach (@other_files) {
           &logthis("other dir file $_");
       }
     foreach (@files) {      foreach (@files) {
         print OUT $ENV{'form.currentpath'}.$_."\n";          &logthis("current dir file $_");
       }
       open OUT, '>'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename;
       foreach my $file (@files) {
           print OUT $ENV{'form.currentpath'}.$file."\n";
       }
       foreach my $file (@other_files) {
           print OUT $file."\n";
     }      }
     close OUT;      close OUT;
     return 'ok';      return 'ok';
Line 3830  sub files_in_path { Line 3840  sub files_in_path {
     my $filename = $user."savedfiles";      my $filename = $user."savedfiles";
     my %return_files;      my %return_files;
     open IN, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename;      open IN, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename;
       while (my $line_in = <IN>) {
           chomp $line_in;
           my @paths_and_file = split m!/!, $line_in;
           my $file_part = pop @paths_and_file;
           my $path_part = join '/', @paths_and_file;
           $path_part.='/';
           my $path_and_file = $path_part.$file_part;
           if ($path_part eq $path) {
               $return_files{$file_part}= 'selected';
           }
       }
       close IN;
     return \%return_files;      return \%return_files;
 }  }
   
Line 3844  sub files_not_in_path { Line 3866  sub files_not_in_path {
         #ok, I know it's clunky, but I want it to work          #ok, I know it's clunky, but I want it to work
         my @paths_and_file = split m!/!, $_;          my @paths_and_file = split m!/!, $_;
         my $file_part = pop @paths_and_file;          my $file_part = pop @paths_and_file;
           chomp $file_part;
         my $path_part = join '/', @paths_and_file;          my $path_part = join '/', @paths_and_file;
         $path_part .= '/';          $path_part .= '/';
         my $path_and_file = $path_part.$file_part;          my $path_and_file = $path_part.$file_part;
         if ($path_part ne $path) {          if ($path_part ne $path) {
             push @return_files, ($path_and_file);              push @return_files, ($path_and_file);
             &logthis("path part is $path_part file is $file_part");  
         } else {  
             &logthis("path part is $path_part file is $file_part");  
         }          }
     }      }
     close OUT;      close OUT;

Removed from v.1.572  
changed lines
  Added in v.1.573


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