[BACK]Return to multidownload.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

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

version 1.15, 2007/04/26 23:07:34 version 1.17, 2007/04/27 22:16:22
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::lonnet;  
 use Apache::grades;  use Apache::grades;
   use Apache::lonnavmaps;
   use Apache::lonnet;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonmsg();  use Apache::lonmsg();
Line 69  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'};
     $symb =~ /^.*\/(.+)\.problem$/;      
     my $zipout = $1.".zip";      my $navmap = Apache::lonnavmaps::navmap->new();
       my $res = $navmap->getBySymb($symb);
       &Apache::lonnet::logthis("$navmap is navmap");
   
       my ($zipout) = ($symb =~ /^.*\/(.+)\.problem$/);
     $zipout =~ s/\s/_/g;      $zipout =~ s/\s/_/g;
       $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 ($partlist,$handgrade,$responseType) = &Apache::grades::response_type($symb);
     my @part_response_id = &Apache::grades::flatten_responseType($responseType);      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 ($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'};
     &mkpath($doc_zip_root."/zipdir/$uname$udom/$unique_path",0,0700);      my $unique_user = $uname.":".$udom;
       &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path",0,0700);
     my $file_problem = 0;      my $file_problem = 0;
     foreach my $stu (@stuchecked) {      foreach my $stu (@stuchecked) {
         my %files_saved;          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) {
             my ($partid,$respid) = @{$part};              my ($partid,$respid) = @{$part};
             &mkpath($doc_zip_root."/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid",0,0700);              &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid",0,0700);
             my $files = &Apache::grades::get_submitted_files($studom,$stuname,$partid,$respid,\%record);              my $files = &Apache::grades::get_submitted_files($studom,$stuname,$partid,$respid,\%record);
             foreach my $file (@$files) {              foreach my $file (@$files) {
                 $file =~ /(^.*\/)(.+$)/;                  my ($file_name_only) = ($file =~ /^.*\/(.+$)/);
                 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);
                 my $destination = "$doc_zip_root/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid/$file_name_only";                  my $destination = "$doc_zip_root/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid/$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
                     &Apache::lonnet::logthis("found duplicate file name");                      my ($file_name,$file_ext) = ($destination =~ /(^.*)(\..+$)/);
                     &Apache::lonnet::logthis("destination was $destination");                      $destination = $file_name.$files_saved{$destination}.$file_ext;
                     $destination =~ /(^.*)(\..+$)/;                      $files_saved{$destination} ++;
                     $destination = $1.$file_increment.$2;  
                     &Apache::lonnet::logthis("destination is $destination");  
                     $file_increment ++;  
                 }                  }
                 $files_saved{$destination} = 1;                  $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 />");
Line 118  if (&Apache::lonnet::allowed('vgr',$scop Line 120  if (&Apache::lonnet::allowed('vgr',$scop
             }              }
         }          }
     }      }
     &mkpath($doc_zip_root."/zipout/$uname$udom",0,0700);      &mkpath($doc_zip_root."/zipout/$unique_user",0,0700);
     my $statement = "cd $doc_zip_root/zipdir/$uname$udom/$unique_path\n";      my $statement = "cd $doc_zip_root/zipdir/$unique_user/$unique_path\n";
     $statement .= "zip -r $doc_zip_root/zipout/$uname$udom/$zipout * > /dev/null";      $statement .= "zip -r $doc_zip_root/zipout/$unique_user/$zipout * > /dev/null";
     system($statement);      system($statement);
     $statement = "rm -rf $doc_zip_root/zipdir/$uname$udom/$unique_path";      $statement = "rm -rf $doc_zip_root/zipdir/$unique_user/$unique_path";
     system($statement);      system($statement);
     print('<a href="/zipspool/zipout/'.$uname.$udom.'/'.$zipout.'">'.      print('<a href="/zipspool/zipout/'.$unique_user.'/'.$zipout.'">'.
             &mt("Click to download").'</a><br />');              &mt("Click to download").'</a><br />');
 } 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.15  
changed lines
  Added in v.1.17

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