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

version 1.14, 2007/04/26 22:16:57 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 $file_problem = 0;          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 95  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);
                 if (!&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) {                      if (!$file_problem) {
                         print &mt("Unable to create: <br />");                          print &mt("Unable to create: <br />");
                         $file_problem = 1;                          $file_problem = 1;

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


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