Changeset 21564 for main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

Timestamp:

2010-01-21T15:59:35+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed lots of occurrences of "GDBM" in comments, variable names and function names, where the code isn't GDBM-specific. Part of making the code less GDBM-specific.

File:

• main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm (modified) (10 diffs)

main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

@@ -31 +31 @@
 #  *               by John Rowe
 #  *  @version 2.0 Package version including seperation from calling code and
-#  *               modularisation by creating gdbmget, gdbmset and
-#  *               get_database_path by John Rowe
+#  *               modularisation by John Rowe
 #  *
 #  *  @author John Thompson, DL Consulting Ltd.
@@ -153 +152 @@
 #  *  1. The Lucene index must be updated. This will involve removing any
 #  *     existing value and, if required, adding a new value in its place.
-#  *  2. The GDBM database must be updated. Again any existing value will be
+#  *  2. The info database must be updated. Again any existing value will be
 #  *     removed and, if required, a new value added.
 #  *  3. Finally a check against the collect.cfg will be done to determine if
@@ -165 +164 @@
 #  *  A. Establish connection to Lucene
 #  *  B. Create a IncrementalDocument object for 'NT1' loading the information
-#  *     from the GDBM
+#  *     from the info database
 #  *  C. Check to see if this metadata is used to build a classifier(s) and if
 #  *     so create the appropriate ClassifyTreeModel(s)
@@ -177 +176 @@
 #  *     iii/ Call addDocument() in ClassifyTreeModel(s) as necessary
 #  *  F. Complete Lucene transaction
-#  *  G. Save IncrementalDocument to GDBM
-#  *  Note: ClassifyTreeModel automatically updates GDBM as necessary.
+#  *  G. Save IncrementalDocument to info database
+#  *  Note: ClassifyTreeModel automatically updates the info database as necessary.
 #  *
 #  *  @param  $collection  The name of the collection to update as a string
@@ -202 +201 @@
     #    Lucene daemon.
     # B. Create a IncrementalDocument object for 'NT1' loading the information
-    #    from the GDBM
+    #    from the info database
     print STDERR "* creating incremental document for $oid\n" unless !$debug;
     my $doc_obj = new IncrementalDocument($collection, $oid);
@@ -232 +231 @@
     if (defined($old_value) && $old_value =~ /[\w\d]+/)
       {
-        print STDERR "* removing '$key'='$old_value' from GDBM database for document $oid\n" unless !$debug;
+        print STDERR "* removing '$key'='$old_value' from info database for document $oid\n" unless !$debug;
         # i/   Call ??? to remove key-value from Lucene index
         #      Moved elsewhere
@@ -247 +246 @@
     if (defined($new_value) && $new_value =~ /[\w\d]+/)
       {
-        print STDERR "* adding '$key'='$new_value' to GDBM database for document $oid\n" unless !$debug;
+        print STDERR "* adding '$key'='$new_value' to info database for document $oid\n" unless !$debug;
         # i/   Call ??? to add key-value from Lucene index
         #      Moved elsewhere
@@ -265 +264 @@
         &callGS2LuceneEditor($collection, $doc_obj->getDocNum, $key, $old_value, $new_value);
       }
-    # G. Save IncrementalDocument to GDBM
+    # G. Save IncrementalDocument to info database
     $doc_obj->saveDocument();
     $doc_obj = 0;
@@ -371 +370 @@
 # /** callGS2LuceneEditor() **/
 
-## Remove a document from the GDBM and Index.
+## Remove a document from the info database and Index.
 #
 #  @param  collection  The collection to alter
@@ -388 +387 @@
     if ($doc_num > -1)
       {
-        # Now use the GDBM utils to write a blank string to this oid in the
-        # database
+        # Now write a blank string to this oid in the info database
     my $index_text_directory_path = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "index", "text");
     my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", $collection, $index_text_directory_path);