Changeset 24460 for main/trunk/greenstone2/perllib/lucenebuilder.pm

Timestamp:

2011-08-24T15:52:02+12:00 (13 years ago)

Author:

davidb

Message:

Code changes to support indexers that are provided through the extension mechanism

File:

• main/trunk/greenstone2/perllib/lucenebuilder.pm (modified) (7 diffs)

main/trunk/greenstone2/perllib/lucenebuilder.pm

@@ -26 +26 @@
 ###########################################################################
 # /*
-#  *  @version 1.0 ?
+#  *  @version 1.0 Automated incremental building
 #  *  @version 2.0 Incremental building assistance added, including
 #  *               remove_document_from_database which implements the granddad's
@@ -33 +33 @@
 #  *               perl script is. John Rowe
 #  *
+#  *  @authro Waikato Digital Library Research Group
 #  *  @author John Rowe, DL Consulting Ltd.
 #  */
@@ -117 +118 @@
     }
     }       
-    
 }
 
@@ -227 +227 @@
     my $outhandle = $self->{'outhandle'};
 
+    $self->pre_build_indexes($indexname);
+
     my $indexes = [];
     if (defined $indexname && $indexname =~ /\w/) {
@@ -233 +235 @@
     $indexes = $self->{'collect_cfg'}->{'indexes'};
     }
-    # have we got para index?
+
+    # Have we got para index?
     foreach my $level (keys %{$self->{'levels'}}) {
     if ($level =~ /paragraph/) {
-        print $outhandle "Warning: Paragraph level indexing not supported by Lucene\n";
+        print $outhandle "Warning: Paragraph level indexing not supported by Lucene/Solr\n";
         last;
     }
     }
-    # create the mapping between the index descriptions
+
+    # Create the mapping between the index descriptions
     # and their directory names (includes subcolls and langs)
     $self->{'index_mapping'} = $self->create_index_mapping ($indexes);
@@ -246 +250 @@
     # build each of the indexes
     foreach my $index (@$indexes) {
+
     if ($self->want_built($index)) {
 
@@ -271 +276 @@
     }
 
-    #define the final field lists
-    $self->make_final_field_list();
+    $self->post_build_indexes();
 }