--- loncom/interface/multidownload.pl	2007/04/26 17:36:10	1.6
+++ loncom/interface/multidownload.pl	2007/04/26 23:07:34	1.15
@@ -2,7 +2,7 @@
 # CGI-script to allow download of all essay submissions of 
 # multiple students.
 #
-# $Id: multidownload.pl,v 1.6 2007/04/26 17:36:10 banghart Exp $
+# $Id: multidownload.pl,v 1.15 2007/04/26 23:07:34 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;
@@ -61,6 +60,7 @@ END
 &Apache::lonlocal::get_language_handle();
 &Apache::loncommon::content_type(undef,'text/html');
 my $identifier = $ENV{'QUERY_STRING'};
+my $unique_path = $identifier.time();
 print(&Apache::loncommon::start_page('Multiple Downloads'));
 
 my $scope = $env{'request.course.id'};
@@ -69,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'});
@@ -78,38 +81,53 @@ 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);
+    &mkpath($doc_zip_root."/zipdir/$uname$udom/$unique_path",0,0700);
+    my $file_problem = 0;
     foreach my $stu (@stuchecked) {
+        my %files_saved;
+        my $file_increment = 2;
         my ($stuname,$studom,$fullname) = split(/:/,$stu);
-        mkdir($doc_zip_root."/zipdir/$uname$udom/$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/$stuname/part$partid",0700);
-            mkdir($doc_zip_root."/zipdir/$uname$udom/$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/$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);
+                my $destination = "$doc_zip_root/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid/$file_name_only";
+                if (exists($files_saved{$destination})) {
+                    # file has already been saved once
+                    &Apache::lonnet::logthis("found duplicate file name");
+                    &Apache::lonnet::logthis("destination was $destination");
+                    $destination =~ /(^.*)(\..+$)/;
+                    $destination = $1.$file_increment.$2;
+                    &Apache::lonnet::logthis("destination is $destination");
+                    $file_increment ++;
+                }
+                $files_saved{$destination} = 1;
+                if (!&copy($source,$destination)) {
+                    if (!$file_problem) {
+                        print &mt("Unable to create: <br />");
+                        $file_problem = 1;
+                    }
+                    print ("$stuname/part$partid/resp$respid/$file_name_only <br />");
                 }
             }
         }
     }
-    mkdir($doc_zip_root."/zipout",0777);
-    my $statement = "zip -r $doc_zip_root/zipout/output.zip $doc_zip_root/zipdir/$uname$udom/* > /dev/null";
+    &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/$zipout * > /dev/null";
     system($statement);
-    $statement = "rm -rf $doc_zip_root/zipdir/$uname$udom";
+    $statement = "rm -rf $doc_zip_root/zipdir/$uname$udom/$unique_path";
     system($statement);
-    print('<a href="/zipspool/zipout/output.zip">Click to download</a><br />');
+    print('<a href="/zipspool/zipout/'.$uname.$udom.'/'.$zipout.'">'.
+            &mt("Click to download").'</a><br />');
 } else {
-    print('You are not authorized to download student submissions.');
+    print(&mt('You are not authorized to download student submissions.'));
 }
 1;
 __END__;