Diff for /loncom/interface/multidownload.pl between versions 1.18 and 1.19

version 1.18, 2007/04/27 22:20:30 version 1.19, 2007/04/27 22:43:11
Line 70  if ($env{'request.course.sec'}) { Line 70  if ($env{'request.course.sec'}) {
 }  }
 if (&Apache::lonnet::allowed('vgr',$scope) eq 'F') {  if (&Apache::lonnet::allowed('vgr',$scope) eq 'F') {
     my $symb = $env{'cgi.'.$identifier.'.symb'};      my $symb = $env{'cgi.'.$identifier.'.symb'};
       
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
     my $res = $navmap->getBySymb($symb);      my $res = $navmap->getBySymb($symb);
       my $partlist = $res->parts();
       foreach my $part(@$partlist) {
           &Apache::lonnet::logthis("partlist is $part");
       }
     my ($zipout) = ($symb =~ /^.*\/(.+)\.problem$/);      my ($zipout) = ($symb =~ /^.*\/(.+)\.problem$/);
     $zipout =~ s/\s/_/g;      $zipout =~ s/\s/_/g;
     $zipout .= ".zip";      $zipout .= ".zip";
     my $courseid = $env{'request.course.id'};      my $courseid = $env{'request.course.id'};
     my @stuchecked = split(/\n/,$env{'cgi.'.$identifier.'.students'});      my @stuchecked = split(/\n/,$env{'cgi.'.$identifier.'.students'});
     my @parts = split(/\n/,$env{'cgi.'.$identifier.'.parts'});      my @parts = split(/\n/,$env{'cgi.'.$identifier.'.parts'});
     my ($partlist,$handgrade,$responseType) = &Apache::grades::response_type($symb);  
     my @part_response_id = &Apache::grades::flatten_responseType($responseType);  
     my $doc_zip_root = $Apache::lonnet::perlvar{'lonZipDir'};      my $doc_zip_root = $Apache::lonnet::perlvar{'lonZipDir'};
 #    my ($partlist,$handgrade,$responseType) = &Apache::grades::response_type($symb);  
     my $uname = $env{'user.name'};      my $uname = $env{'user.name'};
     my $udom = $env{'user.domain'};      my $udom = $env{'user.domain'};
     my $unique_user = $uname.":".$udom;      my $unique_user = $uname.":".$udom;
Line 92  if (&Apache::lonnet::allowed('vgr',$scop Line 92  if (&Apache::lonnet::allowed('vgr',$scop
         my %files_saved;          my %files_saved;
         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 $partid (@$partlist) {
             my ($partid,$respid) = @{$part};              my @ids = $res->responseIds($partid);
             &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid",0,0700);              foreach my $respid(@ids) {
             my $files = &Apache::grades::get_submitted_files($studom,$stuname,$partid,$respid,\%record);                  &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid",0,0700);
             foreach my $file (@$files) {                  my $files = &Apache::grades::get_submitted_files($studom,$stuname,$partid,$respid,\%record);
                 my ($file_name_only) = ($file =~ /^.*\/(.+$)/);                  foreach my $file (@$files) {
                 &Apache::lonnet::repcopy($file);                      my ($file_name_only) = ($file =~ /^.*\/(.+$)/);
                 my $source = &Apache::lonnet::filelocation("",$file);                      &Apache::lonnet::repcopy($file);
                 my $destination = "$doc_zip_root/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid/$file_name_only";                      my $source = &Apache::lonnet::filelocation("",$file);
                 if (exists($files_saved{$destination})) {                      my $destination = "$doc_zip_root/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid/$file_name_only";
                     # file has already been saved once                      if (exists($files_saved{$destination})) {
                     my ($file_name,$file_ext) = ($destination =~ /(^.*)(\..+$)/);                          # file has already been saved once
                     $destination = $file_name.$files_saved{$destination}.$file_ext;                          my ($file_name,$file_ext) = ($destination =~ /(^.*)(\..+$)/);
                     $files_saved{$destination} ++;                          $destination = $file_name.$files_saved{$destination}.$file_ext;
                 }                          $files_saved{$destination} ++;
                 $files_saved{$destination}++;                      }
                 if (!&copy($source,$destination)) {                      $files_saved{$destination}++;
                     if (!$file_problem) {                      if (!&copy($source,$destination)) {
                         print &mt("Unable to create: <br />");                          if (!$file_problem) {
                         $file_problem = 1;                              print &mt("Unable to create: <br />");
                               $file_problem = 1;
                           }
                           print ("$stuname/part$partid/resp$respid/$file_name_only <br />");
                     }                      }
                     print ("$stuname/part$partid/resp$respid/$file_name_only <br />");  
                 }                  }
             }              }
         }          }

Removed from v.1.18  
changed lines
  Added in v.1.19


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