--- loncom/interface/multidownload.pl	2007/04/30 22:47:28	1.23
+++ loncom/interface/multidownload.pl	2007/05/21 22:00:29	1.27
@@ -2,7 +2,7 @@
 # CGI-script to allow download of all essay submissions of 
 # multiple students.
 #
-# $Id: multidownload.pl,v 1.23 2007/04/30 22:47:28 banghart Exp $
+# $Id: multidownload.pl,v 1.27 2007/05/21 22:00:29 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,6 +43,33 @@ use Apache::lonnet;
 use LONCAPA::Enrollment;
 use strict;
 
+sub is_flat {
+    my ($partlist, $res) = @_;
+    my $flat_part = 1;
+    my $flat_resp = 1;
+    if (scalar(@$partlist) > 1) {
+        $flat_part = 0;
+    }
+    foreach my $partid (@$partlist) {
+        my @ids = $res->responseIds($partid);
+        if (scalar(@ids) > 1 ) {
+            $flat_resp = 0;
+        }
+    }
+    return ($flat_part, $flat_resp);
+}
+sub get_part_resp_path {
+    my ($flat_part, $flat_resp, $part_id, $resp_id) = @_;
+    my $part_resp_path = "";
+    if (!$flat_part) {
+        $part_resp_path = "part$part_id/";
+    } 
+    if (!$flat_resp) {
+        $part_resp_path .= "resp$resp_id/";
+    }
+    $part_resp_path =~ s/\/^//; 
+    return('/'.$part_resp_path);
+}
 $|=1;
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
     print <<END;
@@ -62,6 +89,7 @@ END
 my $identifier = $ENV{'QUERY_STRING'};
 my $unique_path = $identifier.time();
 print(&Apache::loncommon::start_page('Multiple Downloads'));
+    
 
 my $scope = $env{'request.course.id'};
 if ($env{'request.course.sec'}) {
@@ -72,39 +100,49 @@ if (&Apache::lonnet::allowed('vgr',$scop
     my $navmap = Apache::lonnavmaps::navmap->new();
     my $res = $navmap->getBySymb($symb);
     my $partlist = $res->parts();
+    my ($flat_part, $flat_resp) = &is_flat($partlist, $res);
     my ($zipout) = ($symb =~ /^.*\/(.+)\.problem$/);
     $zipout =~ s/\s/_/g;
     $zipout .= "$identifier.zip";
     my $courseid = $env{'request.course.id'};
     my @stuchecked = split(/\n/,$env{'cgi.'.$identifier.'.students'});
+    my $number_of_students = scalar(@stuchecked);
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Processing Status',
+                                                    'Preparing Zip File',$number_of_students,'inline','80');
     my @parts = split(/\n/,$env{'cgi.'.$identifier.'.parts'});
     my $doc_zip_root = $Apache::lonnet::perlvar{'lonZipDir'};
     my $uname = $env{'user.name'};
     my $udom = $env{'user.domain'};
     my $unique_user = $uname.":".$udom;
     &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path",0,0700);
-    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");
     }
-    print MANIFEST "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) {
+        $current_student ++;
+        &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,"Processing student $current_student of $number_of_students");
         my %files_saved;
         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";
+         
         foreach my $partid (@$partlist) {
             my @ids = $res->responseIds($partid);
             foreach my $respid(@ids) {
-                &mkpath($doc_zip_root."/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid",0,0700);
+                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";
                     &Apache::lonnet::repcopy($file);
                     my $source = &Apache::lonnet::filelocation("",$file);
-                    my $destination = "$doc_zip_root/zipdir/$unique_user/$unique_path/$stuname/part$partid/resp$respid/$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})) {
                         # file has already been saved once
                         my ($file_name,$file_ext) = ($destination =~ /(^.*)(\..+$)/);
@@ -136,8 +174,9 @@ if (&Apache::lonnet::allowed('vgr',$scop
     }
     $statement = "rm -rf $doc_zip_root/zipdir/$unique_user/$unique_path";
     system($statement);
-    print('<a href="/zipspool/zipout/'.$unique_user.'/'.$zipout.'">'.
-            &mt("Click to download").'</a><br />');
+    &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state);
+    print('<p><a href="/zipspool/zipout/'.$unique_user.'/'.$zipout.'">'.
+            &mt("Click to download").'</a></p><br />');
     close MANIFEST;
 } else {
     print(&mt('You are not authorized to download student submissions.'));