Changeset 18463 for gsdl

Timestamp:

2009-02-05T10:06:24+13:00 (15 years ago)

Author:

davidb

Message:

Warning about file copying in event that a hard link operation is not supported altered to only appear if verbosity > 2

Location:

gsdl/trunk/perllib

Files:

• basebuildproc.pm (modified) (1 diff)
• plugouts/BasePlugout.pm (modified) (1 diff)
• plugouts/DSpacePlugout.pm (modified) (2 diffs)
• util.pm (modified) (2 diffs)

gsdl/trunk/perllib/basebuildproc.pm

@@ -782 +782 @@
         $afile = &util::filename_cat($self->{'assocdir'}, $archivedir, $assoc_file->[1]);
     }
-    &util::hard_link ($assoc_file->[0], $afile);
-    }
-}
-
+    &util::hard_link ($assoc_file->[0], $afile, $self->{'verbosity'});
+    }
+}
+

gsdl/trunk/perllib/plugouts/BasePlugout.pm

@@ -627 +627 @@
         $filename = &util::filename_cat($working_dir, $afile);
 
-        &util::hard_link ($real_filename, $filename);
+        &util::hard_link ($real_filename, $filename, $self->{'verbosity'});
         
         $doc_obj->add_utf8_metadata ($doc_obj->get_top_section(),

gsdl/trunk/perllib/plugouts/DSpacePlugout.pm

@@ -165 +165 @@
     
     $filename = &util::filename_cat($working_dir, $tail_filename);
-    &util::hard_link ($source_filename, $filename);
+    &util::hard_link ($source_filename, $filename, $self->{'verbosity'});
              
     # set the assocfile path (even if we have no assoc files - need this for lucene)
@@ -199 +199 @@
         
         
-        &util::hard_link ($real_filename, $filename);
+        &util::hard_link ($real_filename, $filename, $self->{'verbosity'});
         
         $doc_obj->add_utf8_metadata ($doc_obj->get_top_section(),

gsdl/trunk/perllib/util.pm

@@ -358 +358 @@
 # make hard link to file if supported by OS, otherwise copy the file
 sub hard_link {
-    my ($src, $dest) = @_;
+    my ($src, $dest, $verbosity) = @_;
 
     # remove trailing slashes from source and destination files
@@ -386 +386 @@
 
     } elsif (!link($src, $dest)) {
-    print STDERR "util::hard_link: unable to create hard link. ";
-    print STDERR " Attempting to copy file: $src -> $dest\n";
+    if ((!defined $verbosity) || ($verbosity>2)) {
+        print STDERR "util::hard_link: unable to create hard link. ";
+        print STDERR " Copying file: $src -> $dest\n";
+    }
     &File::Copy::copy ($src, $dest);
     }