--- loncom/interface/multidownload.pl	2007/04/26 23:07:34	1.15
+++ loncom/interface/multidownload.pl	2007/04/27 22:20:30	1.18
@@ -2,7 +2,7 @@
 # CGI-script to allow download of all essay submissions of 
 # multiple students.
 #
-# $Id: multidownload.pl,v 1.15 2007/04/26 23:07:34 banghart Exp $
+# $Id: multidownload.pl,v 1.18 2007/04/27 22:20:30 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,8 +34,9 @@ use File::Basename;
 use File::Copy;
 use IO::File;
 use Apache::lonhtmlcommon();
-use Apache::lonnet;
 use Apache::grades;
+use Apache::lonnavmaps;
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::lonmsg();
@@ -69,45 +70,44 @@ 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";
+    
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $res = $navmap->getBySymb($symb);
+    my ($zipout) = ($symb =~ /^.*\/(.+)\.problem$/);
     $zipout =~ s/\s/_/g;
+    $zipout .= ".zip";
     my $courseid = $env{'request.course.id'};
     my @stuchecked = split(/\n/,$env{'cgi.'.$identifier.'.students'});
     my @parts = split(/\n/,$env{'cgi.'.$identifier.'.parts'});
     my ($partlist,$handgrade,$responseType) = &Apache::grades::response_type($symb);
     my @part_response_id = &Apache::grades::flatten_responseType($responseType);
     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 $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;
     foreach my $stu (@stuchecked) {
         my %files_saved;
-        my $file_increment = 2;
         my ($stuname,$studom,$fullname) = split(/:/,$stu);
         my %record = &Apache::lonnet::restore($symb,$courseid,$studom,$stuname);
         foreach my $part (@part_response_id) {
             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);
             foreach my $file (@$files) {
-                $file =~ /(^.*\/)(.+$)/;
-                my $file_name_only = $2;
+                my ($file_name_only) = ($file =~ /^.*\/(.+$)/);
                 &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";
+                my $destination = "$doc_zip_root/zipdir/$unique_user/$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 ++;
+                    my ($file_name,$file_ext) = ($destination =~ /(^.*)(\..+$)/);
+                    $destination = $file_name.$files_saved{$destination}.$file_ext;
+                    $files_saved{$destination} ++;
                 }
-                $files_saved{$destination} = 1;
+                $files_saved{$destination}++;
                 if (!&copy($source,$destination)) {
                     if (!$file_problem) {
                         print &mt("Unable to create: <br />");
@@ -118,13 +118,13 @@ if (&Apache::lonnet::allowed('vgr',$scop
             }
         }
     }
-    &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";
+    &mkpath($doc_zip_root."/zipout/$unique_user",0,0700);
+    my $statement = "cd $doc_zip_root/zipdir/$unique_user/$unique_path\n";
+    $statement .= "zip -r $doc_zip_root/zipout/$unique_user/$zipout * > /dev/null";
     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);
-    print('<a href="/zipspool/zipout/'.$uname.$udom.'/'.$zipout.'">'.
+    print('<a href="/zipspool/zipout/'.$unique_user.'/'.$zipout.'">'.
             &mt("Click to download").'</a><br />');
 } else {
     print(&mt('You are not authorized to download student submissions.'));