Diff for /loncom/interface/multidownload.pl between versions 1.12 and 1.15

version 1.12, 2007/04/26 21:50:27 version 1.15, 2007/04/26 23:07:34
Line 82  if (&Apache::lonnet::allowed('vgr',$scop Line 82  if (&Apache::lonnet::allowed('vgr',$scop
     my $uname = $env{'user.name'};      my $uname = $env{'user.name'};
     my $udom = $env{'user.domain'};      my $udom = $env{'user.domain'};
     &mkpath($doc_zip_root."/zipdir/$uname$udom/$unique_path",0,0700);      &mkpath($doc_zip_root."/zipdir/$uname$udom/$unique_path",0,0700);
       my $file_problem = 0;
     foreach my $stu (@stuchecked) {      foreach my $stu (@stuchecked) {
           my %files_saved;
           my $file_increment = 2;
         my ($stuname,$studom,$fullname) = split(/:/,$stu);          my ($stuname,$studom,$fullname) = split(/:/,$stu);
         my %record = &Apache::lonnet::restore($symb,$courseid,$studom,$stuname);          my %record = &Apache::lonnet::restore($symb,$courseid,$studom,$stuname);
         foreach my $part (@part_response_id) {          foreach my $part (@part_response_id) {
Line 94  if (&Apache::lonnet::allowed('vgr',$scop Line 97  if (&Apache::lonnet::allowed('vgr',$scop
                 my $file_name_only = $2;                  my $file_name_only = $2;
                 &Apache::lonnet::repcopy($file);                  &Apache::lonnet::repcopy($file);
                 my $source = &Apache::lonnet::filelocation("",$file);                  my $source = &Apache::lonnet::filelocation("",$file);
                 &copy($source,"$doc_zip_root/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid/$file_name_only");                  my $destination = "$doc_zip_root/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid/$file_name_only";
                   if (exists($files_saved{$destination})) {
                       # file has already been saved once
                       &Apache::lonnet::logthis("found duplicate file name");
                       &Apache::lonnet::logthis("destination was $destination");
                       $destination =~ /(^.*)(\..+$)/;
                       $destination = $1.$file_increment.$2;
                       &Apache::lonnet::logthis("destination is $destination");
                       $file_increment ++;
                   }
                   $files_saved{$destination} = 1;
                   if (!&copy($source,$destination)) {
                       if (!$file_problem) {
                           print &mt("Unable to create: <br />");
                           $file_problem = 1;
                       }
                       print ("$stuname/part$partid/resp$respid/$file_name_only <br />");
                   }
             }              }
         }          }
     }      }
Line 104  if (&Apache::lonnet::allowed('vgr',$scop Line 124  if (&Apache::lonnet::allowed('vgr',$scop
     system($statement);      system($statement);
     $statement = "rm -rf $doc_zip_root/zipdir/$uname$udom/$unique_path";      $statement = "rm -rf $doc_zip_root/zipdir/$uname$udom/$unique_path";
     system($statement);      system($statement);
     print('<a href="/zipspool/zipout/'.$uname.$udom.'/'.$zipout.'">Click to download</a><br />');      print('<a href="/zipspool/zipout/'.$uname.$udom.'/'.$zipout.'">'.
               &mt("Click to download").'</a><br />');
 } else {  } else {
     print('You are not authorized to download student submissions.');      print(&mt('You are not authorized to download student submissions.'));
 }  }
 1;  1;
 __END__;  __END__;

Removed from v.1.12  
changed lines
  Added in v.1.15


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