Changeset 21561 for main/trunk/greenstone2/perllib/IncrementalDocument.pm

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.

File:

• main/trunk/greenstone2/perllib/IncrementalDocument.pm (modified) (2 diffs)

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>/)