[LON-CAPA-cvs] cvs: loncom /interface multidownload.pl

[banghart]

banghart		Thu Apr 26 19:07:35 2007 EDT

  Modified files:              
    /loncom/interface	multidownload.pl 
  Log:
  	Set initial condition indicator before starting loop.
  
  	Handle case where student submits files of same name from 
  	different subdirectories.
  
  
Index: loncom/interface/multidownload.pl
diff -u loncom/interface/multidownload.pl:1.14 loncom/interface/multidownload.pl:1.15
--- loncom/interface/multidownload.pl:1.14	Thu Apr 26 18:16:57 2007
+++ loncom/interface/multidownload.pl	Thu Apr 26 19:07:34 2007
@@ -2,7 +2,7 @@
 # CGI-script to allow download of all essay submissions of 
 # multiple students.
 #
-# $Id: multidownload.pl,v 1.14 2007/04/26 22:16:57 banghart Exp $
+# $Id: multidownload.pl,v 1.15 2007/04/26 23:07:34 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,8 +82,10 @@
     my $uname = $env{'user.name'};
     my $udom = $env{'user.domain'};
     &mkpath($doc_zip_root."/zipdir/$uname$udom/$unique_path",0,0700);
+    my $file_problem = 0;
     foreach my $stu (@stuchecked) {
-        my $file_problem = 0;
+        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) {
@@ -95,7 +97,18 @@
                 my $file_name_only = $2;
                 &Apache::lonnet::repcopy($file);
                 my $source = &Apache::lonnet::filelocation("",$file);
-                if (!&copy($source,"$doc_zip_root/zipdir/$uname$udom/$unique_path/$stuname/part$partid/resp$respid/$file_name_only")) {
+                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;