Changeset 21646

Timestamp:

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

Author:

mdewsnip

Message:

Changed ClassifyTreeModel 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:

• ClassifyTreeModel.pm (modified) (2 diffs)
• IncrementalBuildUtils.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/ClassifyTreeModel.pm

@@ -18 +18 @@
 sub new()
   {
-    my ($class, $collection, $root) = @_;
+    my ($class, $collection, $infodbtype, $root) = @_;
     my $debug = 0;
-    print STDERR "ClassifyTreeModel.new(\"$collection\", \"$root\")\n" unless !$debug;
+    print STDERR "ClassifyTreeModel.new(\"$collection\", $infodbtype, \"$root\")\n" unless !$debug;
     # Store the variables
     my $self = {};
     $self->{'collection'} = $collection;
+    $self->{'infodbtype'} = $infodbtype;
     $self->{'debug'} = $debug;
     $self->{'root'} = $root;
@@ -122 +123 @@
 
     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+/)
+    my $infodb_file_path = &dbutil::get_infodb_file_path($self->{'infodbtype'}, $self->getCollection(), $index_text_directory_path);
+    if (&dbutil::read_infodb_entry($self->{'infodbtype'}, $infodb_file_path, $clid) =~ /\w+/)
       {
         # Since the CLID can directly reference the correct entry in the info database we

main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

@@ -127 +127 @@
     if ($is_top)
       {
-        my $dummy_model = new ClassifyTreeModel($collection, "");
+        my $dummy_model = new ClassifyTreeModel($collection, $infodbtype, "");
         my $browselist_node = new ClassifyTreeNode($dummy_model, "browselist");
         # Add the document
@@ -221 +221 @@
                 # Create a tree model for this classifier
                 print STDERR "* creating a tree model for classifier: CL$clidx\n" unless !$debug;
-                my $tree_model_obj = new ClassifyTreeModel($collection, "CL" . $clidx);
+                my $tree_model_obj = new ClassifyTreeModel($collection, $infodbtype, "CL" . $clidx);
                 # And store it for later
                 push(@classifier_tree_models, $tree_model_obj);
@@ -415 +415 @@
                     # Create a tree model for this classifier
                     print STDERR "* creating a tree model for classifier: CL" . $clidx . " [" . $key . "]\n";# unless !$debug;
-                    my $tree_model_obj = new ClassifyTreeModel($collection, "CL" . $clidx);
+                    my $tree_model_obj = new ClassifyTreeModel($collection, $infodbtype, "CL" . $clidx);
                     # And store it against its key for later
                     $classifier_tree_models{$key} = $tree_model_obj;
@@ -442 +442 @@
         # We also have to remove from browselist - the reverse process of
         # adding to browselist shown above.
-        my $dummy_model = new ClassifyTreeModel($collection, "");
+        my $dummy_model = new ClassifyTreeModel($collection, $infodbtype, "");
         my $browselist_node = new ClassifyTreeNode($dummy_model, "browselist");
         # Add the document