--- loncom/interface/multidownload.pl	2007/04/26 18:30:38	1.9
+++ loncom/interface/multidownload.pl	2007/04/26 21:50:27	1.12
@@ -2,7 +2,7 @@
 # CGI-script to allow download of all essay submissions of 
 # multiple students.
 #
-# $Id: multidownload.pl,v 1.9 2007/04/26 18:30:38 banghart Exp $
+# $Id: multidownload.pl,v 1.12 2007/04/26 21:50:27 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,6 @@ use File::Path;
 use File::Basename;
 use File::Copy;
 use IO::File;
-use Image::Magick;
 use Apache::lonhtmlcommon();
 use Apache::lonnet;
 use Apache::grades;
@@ -70,6 +69,9 @@ if ($env{'request.course.sec'}) {
 }
 if (&Apache::lonnet::allowed('vgr',$scope) eq 'F') {
     my $symb = $env{'cgi.'.$identifier.'.symb'};
+    $symb =~ /^.*\/(.+)\.problem$/;
+    my $zipout = $1.".zip";
+    $zipout =~ s/\s/_/g;
     my $courseid = $env{'request.course.id'};
     my @stuchecked = split(/\n/,$env{'cgi.'.$identifier.'.students'});
     my @parts = split(/\n/,$env{'cgi.'.$identifier.'.parts'});
@@ -79,38 +81,30 @@ if (&Apache::lonnet::allowed('vgr',$scop
     my ($partlist,$handgrade,$responseType) = &Apache::grades::response_type($symb);
     my $uname = $env{'user.name'};
     my $udom = $env{'user.domain'};
-    mkdir($doc_zip_root."/zipdir",0700);
-    mkdir($doc_zip_root."/zipdir/$uname$udom",0700);
-    mkdir($doc_zip_root."/zipdir/$uname$udom/$unique_path",0700);
+    &mkpath($doc_zip_root."/zipdir/$uname$udom/$unique_path",0,0700);
     foreach my $stu (@stuchecked) {
         my ($stuname,$studom,$fullname) = split(/:/,$stu);
-        mkdir($doc_zip_root."/zipdir/$uname$udom/$unique_path/$stuname",0700);
         my %record = &Apache::lonnet::restore($symb,$courseid,$studom,$stuname);
         foreach my $part (@part_response_id) {
             my ($partid,$respid) = @{$part};
-            mkdir($doc_zip_root."/zipdir/$uname$udom/$unique_path/$stuname/part$partid",0700);
-            mkdir($doc_zip_root."/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid",0700);
+            &mkpath($doc_zip_root."/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid",0,0700);
             my $files = &Apache::grades::get_submitted_files($studom,$stuname,$partid,$respid,\%record);
             foreach my $file (@$files) {
                 $file =~ /(^.*\/)(.+$)/;
                 my $file_name_only = $2;
-                my $file_content = &Apache::lonnet::getfile($file);
-                if (open(my $fh,">$doc_zip_root/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid/$file_name_only")) {
-                    print($fh $file_content);
-                    close($fh);
-                } else {
-                    print("problem creating file <br />");
-                }
+                &Apache::lonnet::repcopy($file);
+                my $source = &Apache::lonnet::filelocation("",$file);
+                &copy($source,"$doc_zip_root/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid/$file_name_only");
             }
         }
     }
-    mkdir($doc_zip_root."/zipout/$uname$udom",0700);
+    &mkpath($doc_zip_root."/zipout/$uname$udom",0,0700);
     my $statement = "cd $doc_zip_root/zipdir/$uname$udom/$unique_path\n";
-    $statement .= "zip -r $doc_zip_root/zipout/$uname$udom/output.zip * > /dev/null";
+    $statement .= "zip -r $doc_zip_root/zipout/$uname$udom/$zipout * > /dev/null";
     system($statement);
     $statement = "rm -rf $doc_zip_root/zipdir/$uname$udom/$unique_path";
     system($statement);
-    print('<a href="/zipspool/zipout/'.$uname.$udom.'/output.zip">Click to download</a><br />');
+    print('<a href="/zipspool/zipout/'.$uname.$udom.'/'.$zipout.'">Click to download</a><br />');
 } else {
     print('You are not authorized to download student submissions.');
 }