--- loncom/publisher/lonpublisher.pm	2000/12/04 12:27:58	1.12
+++ loncom/publisher/lonpublisher.pm	2000/12/04 15:39:28	1.13
@@ -11,6 +11,7 @@ package Apache::lonpublisher;
 
 use strict;
 use Apache::File;
+use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use HTML::TokeParser;
 use Apache::lonxml;
@@ -127,16 +128,11 @@ sub publish {
 
 # ----------------------------------------------------------------- Backup Copy
 	my $copyfile=$source.'.save';
-        {
-	    my $org=Apache::File->new($source);
-            my $cop=Apache::File->new('>'.$copyfile);
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
+        if (copy($source,$copyfile)) {
 	    print $logfile "Copied original file to ".$copyfile."\n";
         } else {
-	    print $logfile "Unable to write backup ".$copyfile."\n";
-            return "<font color=red>Failed to write backup copy, FAIL</font>";
+	    print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
+          return "<font color=red>Failed to write backup copy, $!,FAIL</font>";
         }
 # ------------------------------------------------------------- IDs and indices
 
@@ -511,39 +507,25 @@ if (-e $target) {
 
     my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
 
-        {
-	    my $org=Apache::File->new($target);
-            my $cop;
-            unless ($cop=Apache::File->new('>'.$copyfile)) {
-                print $logfile "Unable to open for write ".$copyfile."\n";
-                return "<font color=red>Failed to open '.$copyfile.
-                       ', FAIL</font>";
-            }
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
+        if (copy($target,$copyfile)) {
 	    print $logfile "Copied old target to ".$copyfile."\n";
             $scrout.='<p>Copied old target file';
         } else {
-	    print $logfile "Unable to write ".$copyfile."\n";
-            return "<font color=red>Failed to copy old target, FAIL</font>";
+	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
+           return "<font color=red>Failed to copy old target, $!, FAIL</font>";
         }
 
 # --------------------------------------------------------------- Copy Metadata
 
 	$copyfile=$copyfile.'.meta';
-        {
-	    my $org=Apache::File->new($target.'.meta');
-            my $cop=Apache::File->new('>'.$copyfile);
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
+
+        if (copy($target.'.meta',$copyfile)) {
 	    print $logfile "Copied old target  metadata to ".$copyfile."\n";
             $scrout.='<p>Copied old metadata';
         } else {
-	    print $logfile "Unable to write metadata ".$copyfile."\n";
+	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             return 
-              "<font color=red>Failed to write old metadata copy, FAIL</font>";
+       "<font color=red>Failed to write old metadata copy, $!, FAIL</font>";
         }
 
 
@@ -568,39 +550,25 @@ if (-e $target) {
                }
            }
 
-        {
-	    my $org=Apache::File->new($source);
-            my $cop;
-            unless ($cop=Apache::File->new('>'.$copyfile)) {
-                print $logfile "Unable to open for write ".$copyfile."\n";
-                return "<font color=red>Failed to open '.$copyfile.
-                       ', FAIL</font>";
-            }
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
+        if (copy($source,$copyfile)) {
 	    print $logfile "Copied original source to ".$copyfile."\n";
             $scrout.='<p>Copied source file';
         } else {
-	    print $logfile "Unable to write ".$copyfile."\n";
-            return "<font color=red>Failed to copy source, FAIL</font>";
+	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
+            return "<font color=red>Failed to copy source, $!, FAIL</font>";
         }
 
 # --------------------------------------------------------------- Copy Metadata
 
-	my $copyfile=$target.'.meta';
-        {
-	    my $org=Apache::File->new($source.'.meta');
-            my $cop=Apache::File->new('>'.$copyfile);
-            while (my $line=<$org>) { print $cop $line; }
-        }
-        if (-e $copyfile) {
+        $copyfile=$copyfile.'.meta';
+
+        if (copy($source.'.meta',$copyfile)) {
 	    print $logfile "Copied original metadata to ".$copyfile."\n";
             $scrout.='<p>Copied metadata';
         } else {
-	    print $logfile "Unable to write metadata ".$copyfile."\n";
+	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             return 
-                 "<font color=red>Failed to write metadata copy, FAIL</font>";
+          "<font color=red>Failed to write metadata copy, $!, FAIL</font>";
         }
 
 # --------------------------------------------------- Send update notifications