Changeset 17087 for gsdl/trunk/perllib/ClassifyTreeNode.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/ClassifyTreeNode.pm (modified) (9 diffs)

gsdl/trunk/perllib/ClassifyTreeNode.pm

@@ -26 +26 @@
     $self->{'model'} = $model;
     $self->{'clid'} = $clid;
+
+    my $collection = $model->getCollection();
+
     # Check if this node already exists in the database, and if not insert it
     # now
-    my $text = &GDBMUtils::gdbmGet($model->getCollection(), $clid);
+    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
     if($text !~ /\w+/ && $force_new)
       {
-        &GDBMUtils::gdbmSet($model->getCollection(), $clid,
+        &GDBMUtils::gdbmCachedCollectionSet($collection, $clid,
                             "<doctype>classify\n<hastxt>0\n<childtype>VList\n<Title>\n<numleafdocs>0\n<contains>\n");
       }
@@ -108 +111 @@
     # CLID
     my @child_nodes = $self->getChildren();
+
     # Retrieve the current document
     my $text = $self->toString();
+
+    my $collection = $self->{'model'}->getCollection();
+
     # Create a new document with the correct CLID
-    &GDBMUtils::gdbmSet($self->{'model'}->getCollection(), $new_clid, $text);
+    &GDBMUtils::gdbmCachedCollectionSet($collection, $new_clid, $text);
+
     # Remove the old document
-    &GDBMUtils::gdbmSet($self->{'model'}->getCollection(), $self->{'clid'});
+    &GDBMUtils::gdbmCachedCollectionSet($collection, $self->{'clid'});
+
     # Finally, change the clid stored in this document
     $self->{'clid'} = $new_clid;
+
     # Now go through this nodes children, and shift them too
     foreach my $child_node (@child_nodes)
@@ -221 +231 @@
     push(@clid_parts, $suffix);
     my $next_clid = join(".", @clid_parts);
+
+    my $collection = $self->{'model'}->getCollection();
+
     # Now determine if this node exists.
-    if(&GDBMUtils::gdbmGet($self->{'model'}->getCollection(), $next_clid) =~ /\w+/)
+    if(&GDBMUtils::gdbmCachedCollectionGet($collection, $next_clid) =~ /\w+/)
       {
         # And if so, create it.
@@ -474 +487 @@
     # Now remove the node from the database. We do this calling set gdbm with
     # no value argument.
-    &GDBMUtils::gdbmSet($self->{'model'}->getCollection(), $self->{'clid'});
+    my $collection = $self->{'model'}->getCollection();
+    &GDBMUtils::gdbmCachedCollectionSet($collection, $self->{'clid'});
+
     # Return the leaf count (so we can adjust the numleafdocs at the root node
     # of this deletion.
@@ -605 +620 @@
     # Replace any occurance of this nodes CLID with "
     $contains =~ s/$self->{'clid'}/\"/g;
+
+    my $collection = $self->{'model'}->getCollection();
+    my $clid = $self->{'clid'};
+
     # Load the text of this node
-    my $text = &GDBMUtils::gdbmGet($self->{'model'}->getCollection(), $self->{'clid'});
+    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
+
     # Replace the contains
     #rint STDERR "Before: $text\n";
@@ -612 +632 @@
     #rint STDERR "After:  $text\n";
     # Store the changed text
-    &GDBMUtils::gdbmSet($self->{'model'}->getCollection(), $self->{'clid'}, $text);
+    &GDBMUtils::gdbmCachedCollectionSet($collection, $clid, $text);
   }
 # /** setContains() **/
@@ -626 +646 @@
     my ($self, $numleafdocs) = @_;
     print STDERR "ClassifyTreeNode::setNumLeafDocs(numleafdocs)\n" unless !$self->{'debug'};
+
+    my $collection = $self->{'model'}->getCollection();
+    my $clid = $self->{'clid'};
+
     # Load the text of this node
-    my $text = &GDBMUtils::gdbmGet($self->{'model'}->getCollection(), $self->{'clid'});
+    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
     # Replace the numleafdocs
     $text =~ s/<numleafdocs>\d*?\n+/<numleafdocs>$numleafdocs\n/;
     # Store the changed text
-    &GDBMUtils::gdbmSet($self->{'model'}->getCollection(), $self->{'clid'}, $text);
+    &GDBMUtils::gdbmCachedCollectionSet($collection, $clid, $text);
   }
 # /** setNumLeafDocs() **/
@@ -647 +671 @@
     my ($self, $title) = @_;
     print STDERR "ClassifyTreeNode::setTitle(\"$title\")\n" unless !$self->{'debug'};
+
+    my $collection = $self->{'model'}->getCollection();
+    my $clid = $self->{'clid'};
+
     # Load the text of this node
-    my $text = &GDBMUtils::gdbmGet($self->{'model'}->getCollection(), $self->{'clid'});
+    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
     # Replace the title
     $text =~ s/<Title>.*?\n+/<Title>$title\n/;
     # Store the changed text
-    &GDBMUtils::gdbmSet($self->{'model'}->getCollection(), $self->{'clid'}, $text);
+    &GDBMUtils::gdbmCachedCollectionSet($collection, $clid, $text);
   }
 # /** setValue() **/
@@ -666 +694 @@
     my ($self) = @_;
     print STDERR "ClassifyTreeNode::toString()\n" unless !$self->{'debug'};
-    my $text = &GDBMUtils::gdbmGet($self->{'model'}->getCollection(), $self->{'clid'});
+    my $collection = $self->{'model'}->getCollection();
+    my $clid = $self->{'clid'};
+
+    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
     return $text;
   }