Changeset 21561

Timestamp:

2010-01-21T15:03:35+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed calls to GDBMUtils::gdbmCachedCollectionGet() to dbutil::read_infodb_entry(). Part of removing GDBMUtils.pm and making the code less GDBM-specific.

Location:

main/trunk/greenstone2/perllib

Files:

• ClassifyTreeModel.pm (modified) (1 diff)
• ClassifyTreeNode.pm (modified) (6 diffs)
• IncrementalDocument.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/ClassifyTreeModel.pm

@@ -120 +120 @@
     # Unfortunately I have to check that there is text to retrieve before I
     # create a new node.
-    if(&GDBMUtils::gdbmCachedCollectionGet($self->getCollection(), $clid) =~ /\w+/)
+
+    my $index_text_directory_path = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $self->getCollection(), "index", "text");
+    my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", $self->getCollection(), $index_text_directory_path);
+    if (&dbutil::read_infodb_entry("gdbm", $infodb_file_path, $clid) =~ /\w+/)
       {
         # Since the CLID can directly reference the correct entry in the GDBM we

main/trunk/greenstone2/perllib/ClassifyTreeNode.pm

@@ -29 +29 @@
     my $collection = $model->getCollection();
 
+    my $index_text_directory_path = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "index", "text");
+    $self->{'infodb_file_path'} = &dbutil::get_infodb_file_path("gdbm", $collection, $index_text_directory_path);
+
     # Check if this node already exists in the database, and if not insert it
     # now
-    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
+    my $text = &dbutil::read_infodb_entry("gdbm", $self->{'infodb_file_path'}, $clid);
     if($text !~ /\w+/ && $force_new)
       {
@@ -235 +238 @@
 
     # Now determine if this node exists.
-    if(&GDBMUtils::gdbmCachedCollectionGet($collection, $next_clid) =~ /\w+/)
+    if (&dbutil::read_infodb_entry("gdbm", $self->{'infodb_file_path'}, $next_clid) =~ /\w+/)
       {
         # And if so, create it.
@@ -625 +628 @@
 
     # Load the text of this node
-    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
+    my $text = &dbutil::read_infodb_entry("gdbm", $self->{'infodb_file_path'}, $clid);
 
     # Replace the contains
@@ -651 +654 @@
 
     # Load the text of this node
-    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
+    my $text = &dbutil::read_infodb_entry("gdbm", $self->{'infodb_file_path'}, $clid);
     # Replace the numleafdocs
     $text =~ s/<numleafdocs>\d*?\n+/<numleafdocs>$numleafdocs\n/;
@@ -676 +679 @@
 
     # Load the text of this node
-    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
+    my $text = &dbutil::read_infodb_entry("gdbm", $self->{'infodb_file_path'}, $clid);
     # Replace the title
     $text =~ s/<Title>.*?\n+/<Title>$title\n/;
@@ -697 +700 @@
     my $clid = $self->{'clid'};
 
-    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $clid);
+    my $text = &dbutil::read_infodb_entry("gdbm", $self->{'infodb_file_path'}, $clid);
     return $text;
   }

main/trunk/greenstone2/perllib/IncrementalDocument.pm

@@ -149 +149 @@
     # Load the raw text for the document object from GDBM
     my $collection = $self->{'collection'};
-    my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $self->{'oid'});
+    my $index_text_directory_path = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "index", "text");
+    my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", $collection, $index_text_directory_path);
+    my $text = &dbutil::read_infodb_entry("gdbm", $infodb_file_path, $self->{'oid'});
     # For each line in the raw text, extract the key (enclosed in angle
     # brackets) and the value
@@ -193 +195 @@
     if($doc_num >= 0)
       {
-        my $text = &GDBMUtils::gdbmCachedCollectionGet($collection, $doc_num);
+    my $index_text_directory_path = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "index", "text");
+    my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", $collection, $index_text_directory_path);
+    my $text = &dbutil::read_infodb_entry("gdbm", $infodb_file_path, $doc_num);
+
         # If there is no reverse lookup, then add one now
         if($text !~ /<section>/)