Changeset 32614 for main

Timestamp:

2018-11-20T10:50:17+13:00 (5 years ago)

Author:

kjdon

Message:

some changes to arcinfo to handle it holding the reverse lookup db too (from archiveinf-src) - make changes in this object, then write out the complete db at the end of import

File:

• main/trunk/greenstone2/perllib/arcinfo.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/arcinfo.pm

@@ -170 +170 @@
 }
 
-sub load_revinfo_UNTESTED
+sub load_rev_info
 {
     my $self = shift (@_);
@@ -183 +183 @@
     my $vals = $rev_infodb_map->{$srcfile};
 
-    $srcfile = &util::abspath_to_placeholders($srcfile);
-
+    $srcfile = &util::placeholders_to_abspath($srcfile);
     foreach my $OID ($vals =~ m/^<oid>(.*)$/gm) {
         $self->add_reverseinfo($srcfile,$OID);
@@ -249 +248 @@
     my $self = shift (@_);
     my ($rev_filename) = @_;
-
     # Output reverse lookup database
 
     my $rev_infodb_map = $self->{'reverse-info'};
-    my $rev_infodb_handle 
-    = &dbutil::open_infodb_write_handle($self->{'infodbtype'}, $rev_filename, "append");
+    my $rev_infodb_handle
+    = &dbutil::open_infodb_write_handle($self->{'infodbtype'}, $rev_filename);
+#   = &dbutil::open_infodb_write_handle($self->{'infodbtype'}, $rev_filename, "append");
 
     foreach my $key ( keys %$rev_infodb_map ) {
     my $val_hash = $rev_infodb_map->{$key};
-
     $key = &util::abspath_to_placeholders($key);    
 
@@ -270 +268 @@
     my $self = shift (@_);
     my ($filename) = @_;
+
     if ($filename =~ m/(contents)|(\.inf)$/) {
     $self->_save_info_txt($filename);
@@ -395 +394 @@
     }
 
+    for (@$existing_oid) {
+    if ($_ eq $OID) {
+        return; # already in the list
+    }
+    }
     push(@$existing_oid,$OID);
+    
+}
+
+sub remove_reverseinfo {
+     my $self = shift (@_);
+     my ($key, $OID) = @_;
+
+     my $existing_key = $self->{'reverse-info'}->{$key};
+     if (!defined $existing_key) {
+     ###print STDERR "trying to remove entry for $key, but its not there!\n";
+     return;
+     }
+     if (!defined $OID) {
+     ###print STDERR "no oid defined, removing whole entry\n";
+     delete $self->{'reverse-info'}->{$key};
+     return;
+     }
+     my $existing_oid = $existing_key->{'oid'};
+     if (!defined $existing_oid) {
+     ###print STDERR "trying to remove entry for $key, but it has no oid field!\n";
+     return;
+     }
+     for my $i (0..scalar(@$existing_oid)) {
+     if (@$existing_oid[$i] eq $OID) {
+         splice @$existing_oid, $i, 1;
+         if (scalar (@$existing_oid) ==0) {
+         ###print STDERRQ "have removed all oids, delete the main key\n";
+         delete $self->{'reverse-info'}->{$key};
+         }
+         return;
+     }
+     }
+}
+sub get_reverseinfo {
+    my $self = shift (@_);
+    my ($key) = @_;
+
+    if ($self->{'reverse-info'}->{$key}) {
+    return $self->{'reverse-info'}->{$key}->{'oid'};
+    }
+    return undef;
 }