Changeset 15725 for gsdl/trunk/perllib/basebuilder.pm

Timestamp:

2008-05-27T15:02:16+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Added $infodb_type as first argument to all the dbutil functions.

File:

• gsdl/trunk/perllib/basebuilder.pm (modified) (8 diffs)

gsdl/trunk/perllib/basebuilder.pm

@@ -99 +99 @@
     $self->{'collect_cfg_preserve'} = &colcfg::read_collection_cfg_xml ($colcfgname);
     }
-    
+
+    # get the database type for this collection from the collect.cfg file (may be undefined)
+    $self->{'infodbtype'} = $self->{'collect_cfg'}->{'infodbtype'} || "";
+
     # get the list of plugins for this collection
     my $plugins = [];
@@ -321 +324 @@
 
     # Get info database file path
-    my $infodb_file_path = &dbutil::get_infodb_file_path($self->{'collection'}, $textdir);
+    my $infodb_file_path = &dbutil::get_infodb_file_path($self->{'infodbtype'}, $self->{'collection'}, $textdir);
 
     print $outhandle "\n*** creating the info database and processing associated files\n" 
@@ -333 +336 @@
     if ($self->{'keepold'}) {
     # reconstruct doc_obj metadata from database for all docs
-    $reconstructed_docs = &classify::reconstruct_doc_objs_metadata($infodb_file_path);
+    $reconstructed_docs = &classify::reconstruct_doc_objs_metadata($self->{'infodbtype'}, $infodb_file_path);
     }
     
@@ -342 +345 @@
     }
     else {
-    $infodb_handle = &dbutil::open_infodb_write_handle($infodb_file_path);
+    print STDERR "Infodbtype: " . $self->{'infodbtype'} . "\n";
+    $infodb_handle = &dbutil::open_infodb_write_handle($self->{'infodbtype'}, $infodb_file_path);
     if (!defined($infodb_handle))
     {
@@ -349 +353 @@
     }
     }
-    
+
+    $self->{'buildproc'}->set_infodbtype ($self->{'infodbtype'});
     $self->{'buildproc'}->set_output_handle ($infodb_handle);
     $self->{'buildproc'}->set_mode ('infodb');
@@ -382 +387 @@
     
     # output classification information
-    &classify::output_classify_info ($self->{'classifiers'}, $infodb_handle,
+    &classify::output_classify_info ($self->{'classifiers'}, $self->{'infodbtype'}, $infodb_handle,
                      $self->{'remove_empty_classifications'}, 
                      $self->{'gli'});
@@ -391 +396 @@
     # output doclist
     my @doc_list = $self->{'buildproc'}->get_doc_list();
-    &dbutil::write_infodb_entry($infodb_handle, "browselist", { 'hastxt' => [ "0" ],
-                                    'childtype' => [ "VList" ],
-                                    'numleafdocs' => [ scalar(@doc_list) ],
-                                    'thistype' => [ "Invisible" ],
-                                    'contains' => [ join(";", @doc_list) ] });
+    my $browselist_infodb = { 'hastxt' => [ "0" ],
+                  'childtype' => [ "VList" ],
+                  'numleafdocs' => [ scalar(@doc_list) ],
+                  'thistype' => [ "Invisible" ],
+                  'contains' => [ join(";", @doc_list) ] };
+    print STDERR "Infodbtype: " . $self->{'infodbtype'} . "\n";
+    &dbutil::write_infodb_entry($self->{'infodbtype'}, $infodb_handle, "browselist", $browselist_infodb);
 
     close ($infodb_handle) if !$self->{'debug'};
@@ -587 +594 @@
     my %collection_infodb = ();
     $self->get_collection_meta_sets(\%collection_infodb);
-    &dbutil::write_infodb_entry($infodb_handle, "collection", \%collection_infodb);
+    &dbutil::write_infodb_entry($self->{'infodbtype'}, $infodb_handle, "collection", \%collection_infodb);
 }