Changeset 21645 for main/trunk/greenstone2

Timestamp:

2010-01-26T17:25:25+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed IncrementalDocument constructor to take the infodbtype as a parameter, instead of assuming GDBM. Part of making the code less GDBM-specific.

Location:

main/trunk/greenstone2/perllib

Files:

• IncrementalBuildUtils.pm (modified) (2 diffs)
• IncrementalDocument.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

@@ -203 +203 @@
     #    from the info database
     print STDERR "* creating incremental document for $oid\n" unless !$debug;
-    my $doc_obj = new IncrementalDocument($collection, $oid);
+    my $doc_obj = new IncrementalDocument($collection, $infodbtype, $oid);
     $doc_obj->loadDocument();
     # C. Check to see if this metadata is used to build a classifier(s) and if
@@ -380 +380 @@
     # Load the incremental document to go with this oid, as we need some
     # information from it.
-    my $doc_obj = new IncrementalDocument($collection, $oid);
+    my $doc_obj = new IncrementalDocument($collection, $infodbtype, $oid);
     $doc_obj->loadDocument();
     # Check if this object even exists by retrieving the docnum.

main/trunk/greenstone2/perllib/IncrementalDocument.pm

@@ -34 +34 @@
 sub new()
   {
-    my ($class, $collection, $oid) = @_;
-
-    #rint STDERR "IncrementalDocument::new($collection, $oid)\n";
+    my ($class, $collection, $infodbtype, $oid) = @_;
+
+    #rint STDERR "IncrementalDocument::new($collection, $infodbtype, $oid)\n";
 
     # Test the parameters
@@ -47 +47 @@
     # The collection this document object has been loaded from.
     $self->{'collection'} = $collection;
+
+    # The infodbtype for the collection
+    $self->{'infodbtype'} = $infodbtype;
 
     # An associative array of information retrieved from the info database
@@ -150 +153 @@
     my $collection = $self->{'collection'};
     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'});
+    my $infodb_file_path = &dbutil::get_infodb_file_path($self->{'infodbtype'}, $collection, $index_text_directory_path);
+    my $text = &dbutil::read_infodb_entry($self->{'infodbtype'}, $infodb_file_path, $self->{'oid'});
     # For each line in the raw text, extract the key (enclosed in angle
     # brackets) and the value
@@ -189 +192 @@
 
     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 $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $infodb_file_path, "append");
-    &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $self->{'oid'}, &dbutil::convert_infodb_string_to_hash($text));
-    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
+    my $infodb_file_path = &dbutil::get_infodb_file_path($self->{'infodbtype'}, $collection, $index_text_directory_path);
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle($self->{'infodbtype'}, $infodb_file_path, "append");
+    &dbutil::write_infodb_entry($self->{'infodbtype'}, $infodb_file_handle, $self->{'oid'}, &dbutil::convert_infodb_string_to_hash($text));
+    &dbutil::close_infodb_write_handle($self->{'infodbtype'}, $infodb_file_handle);
 
     # There is a little bit of extra complexity when saving an incremental
@@ -200 +203 @@
     if($doc_num >= 0)
       {
-    my $text = &dbutil::read_infodb_entry("gdbm", $infodb_file_path, $doc_num);
+    my $text = &dbutil::read_infodb_entry($self->{'infodbtype'}, $infodb_file_path, $doc_num);
 
         # If there is no reverse lookup, then add one now
         if($text !~ /<section>/)
           {
-        $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $infodb_file_path, "append");
-        &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $doc_num, &dbutil::convert_infodb_string_to_hash("<section>" . $self->{'oid'}));
-        &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
+        $infodb_file_handle = &dbutil::open_infodb_write_handle($self->{'infodbtype'}, $infodb_file_path, "append");
+        &dbutil::write_infodb_entry($self->{'infodbtype'}, $infodb_file_handle, $doc_num, &dbutil::convert_infodb_string_to_hash("<section>" . $self->{'oid'}));
+        &dbutil::close_infodb_write_handle($self->{'infodbtype'}, $infodb_file_handle);
           }
       }