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

version 1.19, 2007/04/27 22:43:11 version 1.29, 2007/05/21 22:37:49
Line 34  use File::Basename; Line 34  use File::Basename;
 use File::Copy;  use File::Copy;
 use IO::File;  use IO::File;
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::grades;  
 use Apache::lonnavmaps;  use Apache::lonnavmaps;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::loncommon();  use Apache::loncommon();
Line 44  use Apache::lonnet; Line 43  use Apache::lonnet;
 use LONCAPA::Enrollment;  use LONCAPA::Enrollment;
 use strict;  use strict;
   
   sub is_flat {
       my ($partlist, $res) = @_;
       my $flat_part = 1;
       my $flat_resp = 1;
       if (scalar(@$partlist) > 1) {
           $flat_part = 0;
       }
       foreach my $partid (@$partlist) {
           my @ids = $res->responseIds($partid);
           if (scalar(@ids) > 1 ) {
               $flat_resp = 0;
           }
       }
       return ($flat_part, $flat_resp);
   }
   sub get_part_resp_path {
       my ($flat_part, $flat_resp, $part_id, $resp_id) = @_;
       my $part_resp_path = "";
       if (!$flat_part) {
           $part_resp_path = "part$part_id/";
       } 
       if (!$flat_resp) {
           $part_resp_path .= "resp$resp_id/";
       }
       $part_resp_path =~ s/\/^//; 
       return('/'.$part_resp_path);
   }
 $|=1;  $|=1;
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {  if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
     print <<END;      print <<END;
Line 63  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 73  if (&Apache::lonnet::allowed('vgr',$scop Line 100  if (&Apache::lonnet::allowed('vgr',$scop
     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();      my $partlist = $res->parts();
     foreach my $part(@$partlist) {      my ($flat_part, $flat_resp) = &is_flat($partlist, $res);
         &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 .= "$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")) {
           &Apache::lonnet::logthis("Problem making manifest");
       }
       print MANIFEST (&mt("Zip file generated on [_1]",&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';
           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) {
                 &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid",0,0700);                  my $part_resp_path = &get_part_resp_path($flat_part,$flat_resp, $partid, $respid);
                 my $files = &Apache::grades::get_submitted_files($studom,$stuname,$partid,$respid,\%record);                  &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path/$stuname/$part_resp_path",0,0700);
                 foreach my $file (@$files) {                  foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {
                       $file = $file_url.$file;
                     my ($file_name_only) = ($file =~ /^.*\/(.+$)/);                      my ($file_name_only) = ($file =~ /^.*\/(.+$)/);
                       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);
                     my $destination = "$doc_zip_root/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid/$file_name_only";                      
                       my $destination = "$doc_zip_root/zipdir/$unique_user/$unique_path/$stuname$part_resp_path/$file_name_only";
                     if (exists($files_saved{$destination})) {                      if (exists($files_saved{$destination})) {
                         # file has already been saved once                          # file has already been saved once
                         my ($file_name,$file_ext) = ($destination =~ /(^.*)(\..+$)/);                          my ($file_name,$file_ext) = ($destination =~ /(^.*)(\..+$)/);
Line 111  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);
     my $statement = "cd $doc_zip_root/zipdir/$unique_user/$unique_path\n";      my $statement;
     $statement .= "zip -r $doc_zip_root/zipout/$unique_user/$zipout * > /dev/null";      if (! -e "$doc_zip_root/zipout/$unique_user/$zipout") {
     system($statement);          $statement = "cd $doc_zip_root/zipdir/$unique_user/$unique_path\n";
           $statement .= "zip -r $doc_zip_root/zipout/$unique_user/$zipout * > /dev/null";
           system($statement);
       } else {
           # should happen only if user reloads page 
           &Apache::lonnet::logthis("$zipout is already there");
       }
     $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);
 } 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.19  
changed lines
  Added in v.1.29


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