Changeset 19789

Timestamp:

2009-06-10T13:43:04+12:00 (15 years ago)

Author:

davidb

Message:

Fixed error in code that works out if a file as associated or not based in information in archives-src.gdb

File:

• gsdl/trunk/perllib/inexport.pm (modified) (5 diffs)

gsdl/trunk/perllib/inexport.pm

@@ -27 +27 @@
 
 use strict;
+
+use File::Basename;
 
 use util;
@@ -179 +181 @@
     my ($file,$doc_rec) = @_;
 
+    my ($file_root,$dirname,$suffix) = fileparse($file, "\\.[^\\.]+\$");
+
     foreach my $af (@{$doc_rec->{'assoc-file'}}) {
-    return 1 if ($af eq $file);
+    my $full_af = &util::filename_cat($dirname,$af);
+
+    return 1 if ($full_af eq $file);
     }
 
@@ -200 +206 @@
     foreach my $file (@$deleted_files) {
     # use 'archiveinf-src' GDBM file to look up all the OIDs
-    # this file is used in (note in most cases, it's just one OID)
+    # that this file is used in (note in most cases, it's just one OID)
     
     my $src_rec = GDBMUtils::gdbmRecordToHash($arcinfo_src_filename,$file);
@@ -245 +251 @@
             
             $block_hash->{'reindex_files'}->{$src_filename} = 1;
+
+            # remove the metadata file from the src-database
+            GDBMUtils::gdbmDatabaseRemove($arcinfo_src_filename,$file);
         }
         else {
@@ -254 +263 @@
         # Whether the main file directly or indirectly, mark for deletion/reindex
 
-        if ($verbosity>1) {
-            print STDERR "$oid ($src_file) marked to be $mode_text on next buildcol.pl\n";
-        }
-        $archive_info->set_status_info($oid,"D");
-
         my $val = &GDBMUtils::gdbmDatabaseGet($arcinfo_doc_filename,$oid);
         my ($index_status) = ($val =~ m/^<index-status>(.*)$/m);
+
+
         if ($index_status ne "D") {
+            if ($verbosity>1) {
+            print STDERR "$oid ($src_file) marked to be $mode_text on next buildcol.pl\n";
+            }
+            $archive_info->set_status_info($oid,"D");
+
             $val =~ s/^<index-status>(.*)$/<index-status>D/m;
             &GDBMUtils::gdbmDatabaseSet($arcinfo_doc_filename,$oid,$val);
+
+            GDBMUtils::gdbmDatabaseRemove($arcinfo_src_filename,$src_file);
         }
 
-        GDBMUtils::gdbmDatabaseRemove($arcinfo_src_filename,$src_file);
+
         }