Diff for /loncom/interface/multidownload.pl between versions 1.25 and 1.28

version 1.25, 2007/05/05 18:51:49 version 1.28, 2007/05/21 22:26:41
Line 89  END Line 89  END
 my $identifier = $ENV{'QUERY_STRING'};  my $identifier = $ENV{'QUERY_STRING'};
 my $unique_path = $identifier.time();  my $unique_path = $identifier.time();
 print(&Apache::loncommon::start_page('Multiple Downloads'));  print(&Apache::loncommon::start_page('Multiple Downloads'));
       
   
 my $scope = $env{'request.course.id'};  my $scope = $env{'request.course.id'};
 if ($env{'request.course.sec'}) {  if ($env{'request.course.sec'}) {
Line 105  if (&Apache::lonnet::allowed('vgr',$scop Line 106  if (&Apache::lonnet::allowed('vgr',$scop
     $zipout .= "$identifier.zip";      $zipout .= "$identifier.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 $number_of_students = scalar(@stuchecked);
       my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Processing Status',
                                                       'Preparing Zip File',$number_of_students,'inline','80');
     my @parts = split(/\n/,$env{'cgi.'.$identifier.'.parts'});      my @parts = split(/\n/,$env{'cgi.'.$identifier.'.parts'});
     my $doc_zip_root = $Apache::lonnet::perlvar{'lonZipDir'};      my $doc_zip_root = $Apache::lonnet::perlvar{'lonZipDir'};
     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;
     &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path",0,0700);      &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path",0,0700);
     if (!open MANIFEST, ">$doc_zip_root/zipdir/$unique_user/$unique_path/manifest.txt") {      if (!open(MANIFEST, ">$doc_zip_root/zipdir/$unique_user/$unique_path/manifest.txt")) {
         &Apache::lonnet::logthis("Problem making manifest");          &Apache::lonnet::logthis("Problem making manifest");
     }      }
     print MANIFEST &mt("Files contained in this zip:\n");      print(MANIFEST &mt("Zip file generated ").&Apache::lonlocal::locallocaltime(time())."\n");
       print(MANIFEST &mt("Files contained in this zip:\n"));
     my $file_problem = 0;      my $file_problem = 0;
       my $current_student = 0;
     foreach my $stu (@stuchecked) {      foreach my $stu (@stuchecked) {
           $current_student ++;
           &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,"Processing student $current_student of $number_of_students");
         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);
         my $file_url = '/uploaded/'.$studom.'/'.$stuname.'/portfolio';          my $file_url = '/uploaded/'.$studom.'/'.$stuname.'/portfolio';
         print MANIFEST $fullname."\n";          print(MANIFEST $fullname."\n");
            
         foreach my $partid (@$partlist) {          foreach my $partid (@$partlist) {
             my @ids = $res->responseIds($partid);              my @ids = $res->responseIds($partid);
             foreach my $respid(@ids) {              foreach my $respid(@ids) {
Line 131  if (&Apache::lonnet::allowed('vgr',$scop Line 138  if (&Apache::lonnet::allowed('vgr',$scop
                 foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {                  foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {
                     $file = $file_url.$file;                      $file = $file_url.$file;
                     my ($file_name_only) = ($file =~ /^.*\/(.+$)/);                      my ($file_name_only) = ($file =~ /^.*\/(.+$)/);
                     print MANIFEST "\t$file_name_only \n";                      print(MANIFEST "\t$file_name_only \n");
                     &Apache::lonnet::repcopy($file);                      &Apache::lonnet::repcopy($file);
                     my $source = &Apache::lonnet::filelocation("",$file);                      my $source = &Apache::lonnet::filelocation("",$file);
                                           
Line 145  if (&Apache::lonnet::allowed('vgr',$scop Line 152  if (&Apache::lonnet::allowed('vgr',$scop
                     $files_saved{$destination}++;                      $files_saved{$destination}++;
                     if (!&copy($source,$destination)) {                      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;
                         }                          }
                         print ("$stuname/part$partid/resp$respid/$file_name_only <br />");                          print("$stuname/part$partid/resp$respid/$file_name_only <br />");
                     }                      }
                 }                  }
             }              }
         }          }
           
     }      }
           
     &mkpath($doc_zip_root."/zipout/$unique_user",0,0700);      &mkpath($doc_zip_root."/zipout/$unique_user",0,0700);
Line 168  if (&Apache::lonnet::allowed('vgr',$scop Line 174  if (&Apache::lonnet::allowed('vgr',$scop
     }      }
     $statement = "rm -rf $doc_zip_root/zipdir/$unique_user/$unique_path";      $statement = "rm -rf $doc_zip_root/zipdir/$unique_user/$unique_path";
     system($statement);      system($statement);
     print('<a href="/zipspool/zipout/'.$unique_user.'/'.$zipout.'">'.      &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state);
             &mt("Click to download").'</a><br />');      print('<p><a href="/zipspool/zipout/'.$unique_user.'/'.$zipout.'">'.
               &mt("Click to download").'</a></p><br />');
     close MANIFEST;      close MANIFEST;
 } else {  } else {
     print(&mt('You are not authorized to download student submissions.'));      print(&mt('You are not authorized to download student submissions.'));

Removed from v.1.25  
changed lines
  Added in v.1.28


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