--- loncom/interface/multidownload.pl	2007/05/21 22:00:29	1.27
+++ loncom/interface/multidownload.pl	2007/06/06 18:51:49	1.36
@@ -2,8 +2,7 @@
 # CGI-script to allow download of all essay submissions of 
 # multiple students.
 #
-# $Id: multidownload.pl,v 1.27 2007/05/21 22:00:29 banghart Exp $
-#
+# $Id: multidownload.pl,v 1.36 2007/06/06 18:51:49 albertel Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -32,10 +31,8 @@ use LONCAPA::loncgi;
 use File::Path;
 use File::Basename;
 use File::Copy;
-use IO::File;
 use Apache::lonhtmlcommon();
-use Apache::lonnavmaps;
-use Apache::lonnet;
+use Apache::lonnavmaps();
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::lonmsg();
@@ -58,6 +55,8 @@ sub is_flat {
     }
     return ($flat_part, $flat_resp);
 }
+
+
 sub get_part_resp_path {
     my ($flat_part, $flat_resp, $part_id, $resp_id) = @_;
     my $part_resp_path = "";
@@ -70,6 +69,8 @@ sub get_part_resp_path {
     $part_resp_path =~ s/\/^//; 
     return('/'.$part_resp_path);
 }
+
+
 $|=1;
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
     print <<END;
@@ -84,6 +85,7 @@ Your cookie information is incorrect.
 END
     return;
 }
+
 &Apache::lonlocal::get_language_handle();
 &Apache::loncommon::content_type(undef,'text/html');
 my $identifier = $ENV{'QUERY_STRING'};
@@ -118,7 +120,11 @@ if (&Apache::lonnet::allowed('vgr',$scop
     if (!open(MANIFEST, ">$doc_zip_root/zipdir/$unique_user/$unique_path/manifest.txt")) {
         &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");
+    print MANIFEST (&mt("Files contained in this zip:\n"));
     my $file_problem = 0;
     my $current_student = 0;
     foreach my $stu (@stuchecked) {
@@ -128,38 +134,43 @@ if (&Apache::lonnet::allowed('vgr',$scop
         my ($stuname,$studom,$fullname) = split(/:/,$stu);
         my %record = &Apache::lonnet::restore($symb,$courseid,$studom,$stuname);
         my $file_url = '/uploaded/'.$studom.'/'.$stuname.'/portfolio';
-        print MANIFEST $fullname."\n";
+        print MANIFEST ($fullname."\n");
          
+        my $submission_count = 0;
         foreach my $partid (@$partlist) {
             my @ids = $res->responseIds($partid);
-            foreach my $respid(@ids) {
+            foreach my $respid (@ids) {
                 my $part_resp_path = &get_part_resp_path($flat_part,$flat_resp, $partid, $respid);
                 &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path/$stuname/$part_resp_path",0,0700);
                 foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {
                     $file = $file_url.$file;
                     my ($file_name_only) = ($file =~ /^.*\/(.+$)/);
-                    print MANIFEST "\t$file_name_only \n";
+                    print MANIFEST ("\t$file_name_only (".&mt("Part [_1]",$partid).
+                                    ") (".&mt("Response [_1]",$respid).")"."\n");
+                    $submission_count ++;
                     &Apache::lonnet::repcopy($file);
                     my $source = &Apache::lonnet::filelocation("",$file);
-                    
                     my $destination = "$doc_zip_root/zipdir/$unique_user/$unique_path/$stuname$part_resp_path/$file_name_only";
                     if (exists($files_saved{$destination})) {
                         # file has already been saved once
                         my ($file_name,$file_ext) = ($destination =~ /(^.*)(\..+$)/);
                         $destination = $file_name.$files_saved{$destination}.$file_ext;
-                        $files_saved{$destination} ++;
+                        $files_saved{$destination}++;
                     }
                     $files_saved{$destination}++;
                     if (!&copy($source,$destination)) {
                         if (!$file_problem) {
-                            print &mt("Unable to create: <br />");
+                            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 />");
                     }
                 }
             }
         }
+        if (!$submission_count) {
+            print MANIFEST ("\t".&mt("No Files Submitted")."\n");
+        }
     }
     
     &mkpath($doc_zip_root."/zipout/$unique_user",0,0700);
@@ -177,7 +188,7 @@ if (&Apache::lonnet::allowed('vgr',$scop
     &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state);
     print('<p><a href="/zipspool/zipout/'.$unique_user.'/'.$zipout.'">'.
             &mt("Click to download").'</a></p><br />');
-    close MANIFEST;
+    close(MANIFEST);
 } else {
     print(&mt('You are not authorized to download student submissions.'));
 }