Changeset 21644 for main

Timestamp:

2010-01-26T17:23:28+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed IncrementalBuildUtils::setDocumentMetadata() to take the infodbtype type as a parameter, instead of assuming GDBM. Part of making the code less GDBM-specific.

Location:

main/trunk/greenstone2

Files:

• bin/script/set_metadata.pl (modified) (1 diff)
• perllib/IncrementalBuildUtils.pm (modified) (3 diffs)

main/trunk/greenstone2/bin/script/set_metadata.pl

@@ -38 +38 @@
 if ($action eq "ADD")
 {
-  &IncrementalBuildUtils::setDocumentMetadata($collection, $oid, $field, "", $a_value, 1);
+  &IncrementalBuildUtils::setDocumentMetadata($collection, "gdbm", $oid, $field, "", $a_value, 1);
 }
 elsif ($action eq "REMOVE")
 {
-  &IncrementalBuildUtils::setDocumentMetadata($collection, $oid, $field, $a_value, "", 1);
+  &IncrementalBuildUtils::setDocumentMetadata($collection, "gdbm", $oid, $field, $a_value, "", 1);
 }
 elsif ($action eq "REPLACE")
 {
-  &IncrementalBuildUtils::setDocumentMetadata($collection, $oid, $field, $a_value, $b_value, 1);
+  &IncrementalBuildUtils::setDocumentMetadata($collection, "gdbm", $oid, $field, $a_value, $b_value, 1);
 }
 

main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

@@ -90 +90 @@
         if ($key eq "docnum")
           {
-            &setDocumentMetadata($collection, $doc_obj->get_OID() . "$section", $key, "", $value, $updateindex);
+            &setDocumentMetadata($collection, $infodbtype, $doc_obj->get_OID() . "$section", $key, "", $value, $updateindex);
             $found_docnum = 1;
           }
@@ -119 +119 @@
               }
             # Go ahead and set the metadata
-            &setDocumentMetadata($collection, $doc_obj->get_OID() . "$section", $key, "", $value, $updateindex);
+            &setDocumentMetadata($collection, $infodbtype, $doc_obj->get_OID() . "$section", $key, "", $value, $updateindex);
           }
       }
@@ -195 +195 @@
 sub setDocumentMetadata()
   {
-    my ($collection, $oid, $key, $old_value, $new_value, $updateindex) = @_;
-    print STDERR "IncrementalBuildUtils::setDocumentMetadata('$collection','$oid','$key','$old_value','$new_value',$updateindex)\n" unless !$debug;
+    my ($collection, $infodbtype, $oid, $key, $old_value, $new_value, $updateindex) = @_;
+    print STDERR "IncrementalBuildUtils::setDocumentMetadata('$collection',$infodbtype,'$oid','$key','$old_value','$new_value',$updateindex)\n" unless !$debug;
     # A. Establish connection to Lucene
     #    This isn't required at the moment, but might be later if we implement