Changeset 37187 for main/trunk/greenstone2/perllib/FileUtils.pm

Timestamp:

2023-01-27T23:52:38+13:00 (17 months ago)

Author:

davidb

Message:

Reworking of file-level document-version history, in light of a clearer understanding of how hardlinking works in terms of inodes on disk. The new solution needs to make use of moving archives to archives_keep, them copying things back. As copying is involved this means time-stamp on the archive infodb used for incremental building can no longer be used to establish which files in 'import' are newer than the last build. The implemented solution here is to store the timestamp of the previous build in a a file (rather than relying on the timestamp of a file created). The opportunity was also taken to record in this file the type of infodb used on that import.pl. With this extra information it is now possible to detect when the type of infodb used has changed in the collectionConfi.xml, meaning import.pl can still function correctly, even in the case of an incremental or incremental-add import.pl being run.

File:

• main/trunk/greenstone2/perllib/FileUtils.pm (modified) (13 diffs)

main/trunk/greenstone2/perllib/FileUtils.pm

@@ -120 +120 @@
 # internal version that copies a file or a group of files
 #
-sub _copyFilesGeneral
+sub copyFilesGeneral
 {
     my ($srcfiles_ref,$dest,$options) = @_;
@@ -137 +137 @@
     if (scalar(@$srcfiles_ref) == 0)
     {
-    print STDERR "FileUtils::_copyFilesGeneral() no destination directory given\n";
+    print STDERR "FileUtils::copyFilesGeneral() no destination directory given\n";
     return 0;
     }
     elsif ((scalar(@$srcfiles_ref) > 1) && (!-d $dest))
     {
-    print STDERR "FileUtils::_copyFilesGeneral() if multiple source files are given the destination must be a directory\n";
+    print STDERR "FileUtils::copyFilesGeneral() if multiple source files are given the destination must be a directory\n";
     return 0;
     }
@@ -159 +159 @@
     if (!-e $file)
     {
-        print STDERR "FileUtils::_copyFilesGeneral() $file does not exist\n";
+        print STDERR "FileUtils::copyFilesGeneral() $file does not exist\n";
         $had_an_error = 1;
         if ($strict) {
@@ -167 +167 @@
     elsif (!-f $file)
     {
-        print STDERR "FileUtils::_copyFilesGeneral() $file is not a regular file\n";
+        print STDERR "FileUtils::copyFilesGeneral() $file is not a regular file\n";
         $had_an_error = 1;
         if ($strict) {
@@ -181 +181 @@
         if (!link($file, $tempdest))
         {
-            print STDERR "Warning: FileUtils::_copyFilesGeneral(): unable to create hard link. ";
+            print STDERR "Warning: FileUtils::copyFilesGeneral(): unable to create hard link. ";
             print STDERR "  Attempting file copy: $file -> $tempdest\n";
             $success = &File::Copy::copy($file, $tempdest);
@@ -195 +195 @@
         
         if (!$success) {
-        print STDERR "FileUtils::_copyFilesGeneral() failed to copy $file -> $tempdest\n";
+        print STDERR "FileUtils::copyFilesGeneral() failed to copy $file -> $tempdest\n";
         $had_an_error = 1;
         
@@ -226 +226 @@
   my (@srcfiles) = @_;
   
-  return &_copyFilesGeneral(\@srcfiles,$dest,undef);
+  return &copyFilesGeneral(\@srcfiles,$dest,undef);
 }
 
@@ -306 +306 @@
     my $strict = 0;
     my $make_fullpath = 0;
+    my $exclude_dirs  = 0;
+    my $exclude_files = 0;
     my $exclude_filter_re = undef;
     my $include_filter_re = undef;
@@ -312 +314 @@
     $strict = $options->{'strict'} if defined $options->{'strict'};
     $make_fullpath = $options->{'make_fullpath'} if defined $options->{'make_fullpath'};
+    $exclude_dirs  = $options->{'exclude_dirs'}  if defined $options->{'exclude_dirs'};
+    $exclude_files = $options->{'exclude_files'} if defined $options->{'exclude_files'};
     $exclude_filter_re = $options->{'exclude_filter_re'} if defined $options->{'exclude_filter_re'};
     $include_filter_re = $options->{'include_filter_re'} if defined $options->{'include_filter_re'};
@@ -330 +334 @@
     {
         next if $f_or_d =~ /^\.\.?$/;
+        next if $exclude_dirs  && -d &filenameConcatenate($src_dir_fullpath, $f_or_d);
+        next if $exclude_files && -f &filenameConcatenate($src_dir_fullpath, $f_or_d);      
         next if (defined $exclude_filter_re && ($f_or_d =~ m/$exclude_filter_re/));
         
@@ -556 +562 @@
             {
                 my $fullpath_subf = $fullpath_subf_or_subd;
-                my $ret_val_success = &_copyFilesGeneral([$fullpath_subf],$dest,$options);
+                my $ret_val_success = &copyFilesGeneral([$fullpath_subf],$dest,$options);
 
                 if ($ret_val_success == 0) {
@@ -585 +591 @@
     else
     {
-        my $ret_val_success = &_copyFilesGeneral([$file], $dest, $options);
+        my $ret_val_success = &copyFilesGeneral([$file], $dest, $options);
         if ($ret_val_success == 0) {
 
@@ -1487 +1493 @@
 ## moveFiles()
 
+
+## @function renameDirectory()
+#
+# rename a directory
+# (effectively a move, where the destination name cannot already exist)
+#
+sub renameDirectory
+{
+    my ($srcdir,$dstdir) = @_;
+
+    my $had_an_error = 0;
+
+    if (!-d $srcdir) {
+    print STDERR "FileUtils::renameDirectory() Error - Source name must be an existing directory\n";
+    print STDERR "Source name was: $srcdir\n";
+    $had_an_error = 1;
+    }
+    elsif (-e $dstdir) {
+    print STDERR "FileUtils::renameDirectory() Error - Destination name must not already exist\n";
+    print STDERR "Destination name was: $dstdir\n";
+    $had_an_error = 1;
+
+    }
+    else {
+    if (!rename($srcdir,$dstdir)) {
+        print STDERR "FileUtils::renameDirectory() -- Error occured moving source name to destination name\n";
+        print STDERR "Source name was: $srcdir\n";
+        print STDERR "Destination name was: $dstdir\n";
+        $had_an_error = 1;
+    }
+    }
+    
+    if ($had_an_error) {
+    return 0; # i.e., not OK!
+    }
+    else {
+    return 1;
+    }
+}
+## renameDirectory()
+  
 ## @function openFileHandle()
 #