Changeset 9669 for trunk/gsdl/perllib/lucenebuilder.pm

Timestamp:

2005-04-14T10:44:59+12:00 (19 years ago)

Author:

kjdon

Message:

fixed up the case where you have subcollection partitions and language partitions - was doing an OR on both, but really needed an OR for partitions ANDed with an OR for langs

File:

• trunk/gsdl/perllib/lucenebuilder.pm (modified) (4 diffs)

trunk/gsdl/perllib/lucenebuilder.pm

@@ -231 +231 @@
     # to a subcollection
     my $indexexparr = [];
+    my $langarr = [];
 
     # there may be subcollection info, and language info. 
@@ -247 +248 @@
     # ones we want in the index
     
-    # this puts a separate Language/en entry in for each language in the list
-    # is this what we want? 
-    # should we just have one entry with Language/en,es/ ??
     my @languages = ();
     my $language_metadata = "Language";
@@ -262 +260 @@
     }
     if($not) {
-        push (@$indexexparr, "!$language_metadata/$language/");
+        push (@$langarr, "!$language");
     } else {
-        push (@$indexexparr, "$language_metadata/$language/");
+        push (@$langarr, "$language");
     }
     }
@@ -307 +305 @@
     $self->{'buildproc'}->set_mode ('text');
     $self->{'buildproc'}->set_index ($index, $indexexparr);
+    $self->{'buildproc'}->set_index_languages ($language_metadata, $langarr) if (defined $language);
     $self->{'buildproc'}->set_indexing_text (1);
     $self->{'buildproc'}->set_store_text(1);