--- loncom/publisher/loncfile.pm	2004/08/12 06:50:15	1.59
+++ loncom/publisher/loncfile.pm	2004/08/24 15:53:21	1.61
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.59 2004/08/12 06:50:15 albertel Exp $
+# $Id: loncfile.pm,v 1.61 2004/08/24 15:53:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -988,11 +988,16 @@ sub Copy2 {
 	unless (copy($oldfile, $newfile)) {
 	    $request->print('<font color="red"> '.&mt('copy Error').': '.$!.'</font>');
 	    return 0;
+	} elsif (!chmod(0660, $newfile)) {
+	    $request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>');
+	    return 0;
+	} elsif (-e $oldfile.'.meta' && 
+		 !copy($oldfile.'.meta', $newfile.'.meta') &&
+		 !chmod(0660, $newfile.'.meta')) {
+	    $request->print('<font color="red"> '.&mt('copy metadata error').
+			    ': '.$!.'</font>');
+	    return 0;
 	} else {
-	    unless (chmod(0660, $newfile)) {
-		$request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>');
-		return 0;
-	    }
 	    return 1;
 	}
     } else {
@@ -1166,6 +1171,7 @@ sub handler {
 
     $r=shift;
 
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']);
 
     &Debug($r, "loncfile.pm - handler entered");
     &Debug($r, " filename: ".$ENV{'form.filename'});
@@ -1184,7 +1190,6 @@ sub handler {
     }  elsif($ENV{'QUERY_STRING'} && $ENV{'form.phase'} ne 'two') {  
 	#Just hijack the script only the first time around to inject the
 	#correct information for further processing
-	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress']);
 	$fn=&Apache::lonnet::unescape($ENV{'form.decompress'});
 	$fn=&URLToPath($fn);
 	$ENV{'form.action'}="decompress";