Changeset 20788

Timestamp:

2009-10-07T15:23:22+13:00 (15 years ago)

Author:

kjdon

Message:

rewrote _mark_docs_for_deletion. I think the cases for assoc fiel and meta file are the same, so merged the two cases.

File:

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

gsdl/trunk/perllib/inexport.pm

@@ -249 +249 @@
 }
 
-
+# not used anymore
 sub is_assoc_file
 {
@@ -266 +266 @@
 
 
+
+# this is used to delete "deleted" docs, and to remove old versions of "changed" docs
 sub _mark_docs_for_deletion
 {
@@ -284 +286 @@
     my $oids = $src_rec->{'oid'};
     my $file_record_deleted = 0;
+
+    # delete the src record
+    GDBMUtils::gdbmDatabaseRemove($arcinfo_src_filename,$file);
+    
     foreach my $oid (@$oids) {
-        # Find out if it's a main doc, assoc file, or metadata
-
+
+        # find the source doc (the primary file that becomes this oid)
         my $doc_rec = GDBMUtils::gdbmRecordToHash($arcinfo_doc_filename,$oid);
         my $doc_source_file = $doc_rec->{'src-file'}->[0];
@@ -293 +299 @@
         }
 
-        if (is_assoc_file($file,$doc_rec)) {
-        ## -- kjdon - here, do same thing as for metadata file??
-        ## mark source for reimport??
-        # assoc file => mark it for re-indexing (safest thing to do)
-        my $curr_status = $archive_info->get_status_info($oid);
-
+        if ($doc_source_file ne $file) {
+        # its an associated or metadata file
+        
         # mark source doc for reimport as one of its assoc files has changed or deleted
         $block_hash->{'reindex_files'}->{$doc_source_file} = 1;
-        if (defined($curr_status) && (($curr_status ne "D") && ($curr_status ne "R"))) {
-            if ($verbosity > 1) {
-            print STDERR "$oid marked for (potential) reindexing\n";
-            print STDERR "  (because associated file $file deleted)\n";
-            }
-            $archive_info->set_status_info($oid,"R");
-
-            my $val = &GDBMUtils::gdbmDatabaseGet($arcinfo_doc_filename,$oid);
-            $val =~ s/^<index-status>(.*)$/<index-status>R/m;
-            &GDBMUtils::gdbmDatabaseSet($arcinfo_doc_filename,$oid,$val);
+        
+        }
+        my $curr_status = $archive_info->get_status_info($oid);
+        if (defined($curr_status) && (($curr_status ne "D"))) {
+        if ($verbosity>1) {
+            print STDERR "$oid ($doc_source_file) marked to be $mode_text on next buildcol.pl\n";
         }
-        GDBMUtils::gdbmDatabaseRemove($arcinfo_src_filename,$file) unless $file_record_deleted;
-        $file_record_deleted = 1;
-        }
-        else {
-        # either src-file or metadata.xml file linking to src-file
-        # actually, metadata files should not get here, as are 
-        # processed earlier
-
-        if ($doc_rec->{'src-file'}->[0] ne $file) {
-            # it's a metadata file attached to this OID
-            # => reindex the src-file it matches to
-
-            $block_hash->{'reindex_files'}->{$doc_source_file} = 1;
-
-            # remove the metadata file from the src-database
-            
-            GDBMUtils::gdbmDatabaseRemove($arcinfo_src_filename,$file) unless $file_record_deleted;
-            $file_record_deleted = 1;
-        }
-
-        # Whether the main file directly or indirectly, mark for deletion/reindex
-
+        # mark oid for deletion (it will be deleted or reimported)
+        $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 ($doc_source_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,$doc_source_file);
-        }
-
-
-        }
-
-    }
-    }
-}
-
+        $val =~ s/^<index-status>(.*)$/<index-status>D/m;
+        &GDBMUtils::gdbmDatabaseSet($arcinfo_doc_filename,$oid,$val);
+        }
+    }
+    }
+}
 
 sub mark_docs_for_deletion