Changeset 17087 for gsdl/trunk/perllib/IncrementalDocument.pm

Timestamp:

2008-08-29T13:10:39+12:00 (16 years ago)

Author:

davidb

Message:

Introduction of new GDBM alternative for archives.inf as step towards full incremental building. Information traditionally stored in archives.inf PLUS additional information that will help with working out what files have changed since last build, and what doc-id they hashed to is stored in two GDBM databases. For now these databases aren't read, but in the future ArchivesInfPlugin will be upgraded to use these to support these.

File:

• gsdl/trunk/perllib/IncrementalDocument.pm (modified) (7 diffs)

gsdl/trunk/perllib/IncrementalDocument.pm

@@ -35 +35 @@
   {
     my ($class, $collection, $oid) = @_;
+
     #rint STDERR "IncrementalDocument::new($collection, $oid)\n";
+
     # Test the parameters
     die ("Error! Can't create a document that doesn't belong to a collection!") unless $collection;
     die ("Error! Can't create a document that doesn't have a unique id (OID)!") unless $oid;
+
     # Store the variables
     my $self = {};
+
     # The collection this document object has been loaded from.
     $self->{'collection'} = $collection;
+
     # An associative array of information retrieved from the GDBM database
     # which maps a key string to a nested associative array listing values.
     $self->{'data'} = {};
+
     # The unique identifier of the document loaded
     $self->{'oid'} = $oid;
+
     # Stores the order in which metadata keys where discovered/added.
     $self->{'order'} = {};
-    # Bless me father for I have sinned
+
     bless $self, $class;
     return $self;
@@ -61 +68 @@
   {
     my ($self, $key, $value, $internal) = @_;
+
     # Validate the arguments
     die ("Error! Can't add a metadata value to a document without a valid key!") unless $key =~ /[\w]+/;
     die ("Error! Can't add a metadata key to a document without a valid value!") unless $value =~ /[\w\d]+/;
+
     # Is this a new key that we haven't encountered before? If so ensure an
     # array exists for its values, and record the order in which we encountered
@@ -75 +84 @@
         $self->{'data'}->{$key} = {};
       }
+
     # Set the value of the associative path to 1.
     $self->{'data'}->{$key}->{$value} = 1;
@@ -84 +94 @@
 #  */
 sub getAllMetadata()
-  {
+{
+    my ($self) = @_;
+    my @all_metadata;
+
     print STDERR "IncrementalDocument.getAllMetadata()\n";
-    my ($self) = @_;
-    my @all_metadata;
 
     my $key_count = scalar(keys %{$self->{'order'}});
@@ -137 +148 @@
     #rint STDERR "IncrementalDocument::loadDocument()\n";
     # Load the raw text for the document object from GDBM
-    my $text = &GDBMUtils::gdbmGet($self->{'collection'}, $self->{'oid'});
+    my $collection = $self->{'collection'};
+    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $self->{'oid'});
     # For each line in the raw text, extract the key (enclosed in angle
     # brackets) and the value
@@ -170 +182 @@
     # Get a textual version of this object
     my $text = $self->toString();
+
     # Now store the object in the database using the GDBM utilities
-    &GDBMUtils::gdbmSet($self->{'collection'}, $self->{'oid'}, $text);
+    my $collection = $self->{'collection'};
+    &GDBMUtils::gdbmCachedCollectionSet($collection, $self->{'oid'}, $text);
+
     # There is a little bit of extra complexity when saving an incremental
     # document in that we should ensure that a reverse lookup-from DocNum or
@@ -178 +193 @@
     if($doc_num >= 0)
       {
-        my $text = &GDBMUtils::gdbmGet($self->{'collection'}, $doc_num);
+        my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $doc_num);
         # If there is no reverse lookup, then add one now
         if($text !~ /<section>/)
           {
-            &GDBMUtils::gdbmSet($self->{'collection'}, $doc_num, "<section>" . $self->{'oid'});
+            &GDBMUtils::gdbmCachedCollectionSet($collection, $doc_num, "<section>" . $self->{'oid'});
           }
       }