Changeset 37200 for main/trunk/greenstone2/perllib/plugouts/DSpacePlugout.pm

Timestamp:

2023-01-28T23:08:43+13:00 (15 months ago)

Author:

davidb

Message:

New minus option added in to allow control over whether hardlinking or copying of files is used; also removed some deprecated functions from FileUtils.pm

File:

• main/trunk/greenstone2/perllib/plugouts/DSpacePlugout.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugouts/DSpacePlugout.pm

@@ -290 +290 @@
     
     $filename = &FileUtils::filenameConcatenate($working_dir, $tail_filename);
-    &FileUtils::hardLink ($source_filename, $filename, $self->{'verbosity'});
+    if ($self->{'assocfile_copymode'} eq "hardlink") {
+    &FileUtils::hardLink ($source_filename, $filename, $self->{'verbosity'}); # Consider adding in 'strict' option??
+    }
+    else {
+    &FileUtils::copyFilesGeneral([$source_filename], $filename); # Consider adding in 'strict' option??
+    }
              
     # set the assocfile path (even if we have no assoc files - need this for lucene)
@@ -326 +331 @@
         
         if ($afile ne "cover.jpg") {
-            &FileUtils::hardLink ($real_filename, $filename, $self->{'verbosity'});
-            $doc_obj->add_utf8_metadata ($doc_obj->get_top_section(),
-                 "gsdlassocfile",
-                 "$afile:$assoc_file_rec->[2]:$dir");
+            if ($self->{'assocfile_copymode'} eq "hardlink") {
+            &FileUtils::hardLink($real_filename, $filename, $self->{'verbosity'}); # Consider adding in 'strict' option??
+            }
+            else {
+            &FileUtils::copyFilesGeneral([$real_filename], $filename); # Consider adding in 'strict' option??
+            }
+            $doc_obj->add_utf8_metadata ($doc_obj->get_top_section(),
+                         "gsdlassocfile",
+                         "$afile:$assoc_file_rec->[2]:$dir");
         }
     } elsif ($self->{'verbosity'} > 2) {