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

Diff for /loncom/interface/multidownload.pl between versions 1.27 and 1.34

version 1.27, 2007/05/21 22:00:29 version 1.34, 2007/05/23 20:30:05
Line 3 Line 3
 # multiple students.  # multiple students.
 #  #
 # $Id$  # $Id$
 #  
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
Line 118  if (&Apache::lonnet::allowed('vgr',$scop Line 117  if (&Apache::lonnet::allowed('vgr',$scop
     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 on [_1]",&Apache::lonlocal::locallocaltime(time()))."\n");
       print MANIFEST (&mt("Course: [_1]",$env{"course.$courseid.description"})."\n");
       print MANIFEST (&mt("Problem: [_1]",$res->compTitle)."\n");
       print MANIFEST (&mt("Files contained in this zip:\n"));
     my $file_problem = 0;      my $file_problem = 0;
     my $current_student = 0;      my $current_student = 0;
     foreach my $stu (@stuchecked) {      foreach my $stu (@stuchecked) {
Line 128  if (&Apache::lonnet::allowed('vgr',$scop Line 130  if (&Apache::lonnet::allowed('vgr',$scop
         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");
                    my $submission_count = 0;
         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 138  if (&Apache::lonnet::allowed('vgr',$scop Line 140  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");
                       $submission_count ++;
                     &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_resp_path/$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
Line 152  if (&Apache::lonnet::allowed('vgr',$scop Line 154  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 />");
                     }                      }
                 }                  }
             }              }
         }          }
           if (!$submission_count) {
               print MANIFEST ("\t".&mt("No Files Submitted")."\n");
           }
     }      }
           
     &mkpath($doc_zip_root."/zipout/$unique_user",0,0700);      &mkpath($doc_zip_root."/zipout/$unique_user",0,0700);
Line 177  if (&Apache::lonnet::allowed('vgr',$scop Line 182  if (&Apache::lonnet::allowed('vgr',$scop
     &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state);      &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state);
     print('<p><a href="/zipspool/zipout/'.$unique_user.'/'.$zipout.'">'.      print('<p><a href="/zipspool/zipout/'.$unique_user.'/'.$zipout.'">'.
             &mt("Click to download").'</a></p><br />');              &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.27  
changed lines
  Added in v.1.34

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