Changeset 21643

Timestamp:

2010-01-26T17:17:32+13:00 (14 years ago)

Author:

mdewsnip

Message:

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

Location:

main/trunk/greenstone2/perllib

Files:

• IncrementalBuildUtils.pm (modified) (2 diffs)
• lucenebuildproc.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

@@ -71 +71 @@
 sub addDocument()
   {
-    my ($collection, $doc_obj, $section, $updateindex) = @_;
+    my ($collection, $infodbtype, $doc_obj, $section, $updateindex) = @_;
 
     $updateindex = 0 unless defined($updateindex);
 
-    print STDERR "IncrementalBuildUtils::addDocument('$collection',$doc_obj,'$section')\n" unless !$debug;
+    print STDERR "IncrementalBuildUtils::addDocument('$collection',$infodbtype,$doc_obj,'$section')\n" unless !$debug;
     # Gonna need to know in several places whether this is the top section
     # of the document or not
@@ -140 +140 @@
       {
         foreach my $subsection (@{$section_ptr->{'subsection_order'}}) {
-          &addDocument($collection, $doc_obj, "$section.$subsection");
+          &addDocument($collection, $infodbtype, $doc_obj, "$section.$subsection");
           push(@contains, "\".$subsection");
         }

main/trunk/greenstone2/perllib/lucenebuildproc.pm

@@ -498 +498 @@
           }
         print STDERR "\n*** incrementally add metadata from document at: " . $file . "\n" if ($self->{'verbosity'} > 3);
-        &IncrementalBuildUtils::addDocument($self->{'collection'}, $doc_obj, $doc_obj->get_top_section());
+        &IncrementalBuildUtils::addDocument($self->{'collection'}, $self->{'infodbtype'}, $doc_obj, $doc_obj->get_top_section());
       }
     else