Changeset 21646 for main/trunk/greenstone2/perllib/ClassifyTreeModel.pm

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.

File:

• main/trunk/greenstone2/perllib/ClassifyTreeModel.pm (modified) (2 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