- Timestamp:
- 2010-01-26T17:30:08+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/ClassifyTreeModel.pm
r21564 r21646 18 18 sub new() 19 19 { 20 my ($class, $collection, $ root) = @_;20 my ($class, $collection, $infodbtype, $root) = @_; 21 21 my $debug = 0; 22 print STDERR "ClassifyTreeModel.new(\"$collection\", \"$root\")\n" unless !$debug;22 print STDERR "ClassifyTreeModel.new(\"$collection\", $infodbtype, \"$root\")\n" unless !$debug; 23 23 # Store the variables 24 24 my $self = {}; 25 25 $self->{'collection'} = $collection; 26 $self->{'infodbtype'} = $infodbtype; 26 27 $self->{'debug'} = $debug; 27 28 $self->{'root'} = $root; … … 122 123 123 124 my $index_text_directory_path = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $self->getCollection(), "index", "text"); 124 my $infodb_file_path = &dbutil::get_infodb_file_path( "gdbm", $self->getCollection(), $index_text_directory_path);125 if (&dbutil::read_infodb_entry( "gdbm", $infodb_file_path, $clid) =~ /\w+/)125 my $infodb_file_path = &dbutil::get_infodb_file_path($self->{'infodbtype'}, $self->getCollection(), $index_text_directory_path); 126 if (&dbutil::read_infodb_entry($self->{'infodbtype'}, $infodb_file_path, $clid) =~ /\w+/) 126 127 { 127 128 # Since the CLID can directly reference the correct entry in the info database we -
main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm
r21645 r21646 127 127 if ($is_top) 128 128 { 129 my $dummy_model = new ClassifyTreeModel($collection, "");129 my $dummy_model = new ClassifyTreeModel($collection, $infodbtype, ""); 130 130 my $browselist_node = new ClassifyTreeNode($dummy_model, "browselist"); 131 131 # Add the document … … 221 221 # Create a tree model for this classifier 222 222 print STDERR "* creating a tree model for classifier: CL$clidx\n" unless !$debug; 223 my $tree_model_obj = new ClassifyTreeModel($collection, "CL" . $clidx);223 my $tree_model_obj = new ClassifyTreeModel($collection, $infodbtype, "CL" . $clidx); 224 224 # And store it for later 225 225 push(@classifier_tree_models, $tree_model_obj); … … 415 415 # Create a tree model for this classifier 416 416 print STDERR "* creating a tree model for classifier: CL" . $clidx . " [" . $key . "]\n";# unless !$debug; 417 my $tree_model_obj = new ClassifyTreeModel($collection, "CL" . $clidx);417 my $tree_model_obj = new ClassifyTreeModel($collection, $infodbtype, "CL" . $clidx); 418 418 # And store it against its key for later 419 419 $classifier_tree_models{$key} = $tree_model_obj; … … 442 442 # We also have to remove from browselist - the reverse process of 443 443 # adding to browselist shown above. 444 my $dummy_model = new ClassifyTreeModel($collection, "");444 my $dummy_model = new ClassifyTreeModel($collection, $infodbtype, ""); 445 445 my $browselist_node = new ClassifyTreeNode($dummy_model, "browselist"); 446 446 # Add the document
Note:
See TracChangeset
for help on using the changeset viewer.