Changeset 21562 for main/trunk/greenstone2/perllib/ClassifyTreeNode.pm

Timestamp:

2010-01-21T15:22:28+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed calls to GDBMUtils::gdbmCachedCollectionSet() to dbutil::write_infodb_entry(). Part of removing GDBMUtils.pm and making the code less GDBM-specific.

File:

• main/trunk/greenstone2/perllib/ClassifyTreeNode.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/ClassifyTreeNode.pm

@@ -37 +37 @@
     if($text !~ /\w+/ && $force_new)
       {
-        &GDBMUtils::gdbmCachedCollectionSet($collection, $clid,
-                            "<doctype>classify\n<hastxt>0\n<childtype>VList\n<Title>\n<numleafdocs>0\n<contains>\n");
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $self->{'infodb_file_path'}, "append");
+    &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $clid, &dbutil::convert_infodb_string_to_hash("<doctype>classify\n<hastxt>0\n<childtype>VList\n<Title>\n<numleafdocs>0\n<contains>\n"));
+    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
       }
     # Bless me father for I have sinned
@@ -121 +122 @@
 
     # Create a new document with the correct CLID
-    &GDBMUtils::gdbmCachedCollectionSet($collection, $new_clid, $text);
-
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $self->{'infodb_file_path'}, "append");
+    &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $new_clid, &dbutil::convert_infodb_string_to_hash($text));
     # Remove the old document
-    &GDBMUtils::gdbmCachedCollectionSet($collection, $self->{'clid'});
+    &dbutil::delete_infodb_entry("gdbm", $infodb_file_handle, $self->{'clid'});
+    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
 
     # Finally, change the clid stored in this document
@@ -488 +490 @@
         $num_leaf_docs += $1;
       }
-    # Now remove the node from the database. We do this calling set gdbm with
-    # no value argument.
-    my $collection = $self->{'model'}->getCollection();
-    &GDBMUtils::gdbmCachedCollectionSet($collection, $self->{'clid'});
+    # Now remove the node from the database
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $self->{'infodb_file_path'}, "append");
+    &dbutil::delete_infodb_entry("gdbm", $infodb_file_handle, $self->{'clid'});
+    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
 
     # Return the leaf count (so we can adjust the numleafdocs at the root node
@@ -635 +637 @@
     #rint STDERR "After:  $text\n";
     # Store the changed text
-    &GDBMUtils::gdbmCachedCollectionSet($collection, $clid, $text);
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $self->{'infodb_file_path'}, "append");
+    &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $clid, &dbutil::convert_infodb_string_to_hash($text));
+    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
   }
 # /** setContains() **/
@@ -658 +662 @@
     $text =~ s/<numleafdocs>\d*?\n+/<numleafdocs>$numleafdocs\n/;
     # Store the changed text
-    &GDBMUtils::gdbmCachedCollectionSet($collection, $clid, $text);
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $self->{'infodb_file_path'}, "append");
+    &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $clid, &dbutil::convert_infodb_string_to_hash($text));
+    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
   }
 # /** setNumLeafDocs() **/
@@ -683 +689 @@
     $text =~ s/<Title>.*?\n+/<Title>$title\n/;
     # Store the changed text
-    &GDBMUtils::gdbmCachedCollectionSet($collection, $clid, $text);
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $self->{'infodb_file_path'}, "append");
+    &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $clid, &dbutil::convert_infodb_string_to_hash($text));
+    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
   }
 # /** setValue() **/