Changeset 20651 for gsdl/trunk/perllib/expinfo.pm

Timestamp:

2009-09-21T13:35:55+12:00 (15 years ago)

Author:

davidb

Message:

Updated to support incremental exporting

File:

• gsdl/trunk/perllib/expinfo.pm (modified) (2 diffs)

gsdl/trunk/perllib/expinfo.pm

@@ -105 +105 @@
 sub add_info {
     my $self = shift (@_);
-    my ($OID, $doc_file, $sortmeta) = @_;
+    my ($OID, $doc_file, $index_status, $sortmeta) = @_;
     $sortmeta = "" unless defined $sortmeta;
 
@@ -112 +112 @@
     return undef;
     }
-    $self->delete_info ($OID);
-    $self->{'info'}->{$OID} = [$doc_file];
+
+    print STDERR "**** adding info $OID\n";
+
+    if (defined $self->{'info'}->{$OID}) {
+    # test to see if we are in a reindex situation
+
+    my $existing_status_info = $self->get_status_info($OID);
+
+    if ($existing_status_info eq "D") {
+        # yes, we're in a reindexing situation
+        $self->delete_info ($OID);
+
+
+        # force setting to "reindex"
+        $index_status = "R";
+
+    }
+    else {
+        # some other, possibly erroneous, situation has arisen
+        # where the document already seems to exist
+        print STDERR "Warning: $OID already exists with index status $existing_status_info\n";
+        print STDERR "         Deleting previous version\n";
+
+        $self->delete_info ($OID);
+    }
+    }
+
+    $self->{'info'}->{$OID} = [$doc_file,$index_status];
     push (@{$self->{'order'}}, [$OID, $sortmeta]);
 }