Changeset 27328 for main/trunk/greenstone2/perllib/mgppbuilder.pm

Timestamp:

2013-05-14T11:09:58+12:00 (11 years ago)

Author:

kjdon

Message:

changed the way we store the list of fields that has been indexed, and the mapping between index and shortname. They are separated now, to avoid calculating a shortname for a field each time a new document is indexed - previously if there was no value, then the shortname was not remembered as it wasn't indexed, so each new document saw the shortname being calculated again. remove namespaces from meta fields before calculating shortnames, to make them more sensible. eg dc.Title->TI instead of DC.

File:

• main/trunk/greenstone2/perllib/mgppbuilder.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/mgppbuilder.pm

@@ -489 +489 @@
     $self->{'buildproc'}->set_index_languages ($languagemetadata, $langarr) if (defined $language);
     $self->{'buildproc'}->set_indexing_text (1);
-    #$self->{'buildproc'}->set_indexfieldmap ($self->{'indexfieldmap'});
     $self->{'buildproc'}->set_levels ($self->{'levels'}); 
     $self->{'buildproc'}->set_db_level ($db_level);   
@@ -637 +636 @@
     # these now come from collection meta. if that is not defined, uses the metadata name
     my $collmeta = "";
-    if (defined $self->{'build_cfg'}->{'indexfields'}) {
-    foreach my $longfield (@{$self->{'build_cfg'}->{'indexfields'}}){
-        my $shortfield = $self->{'buildproc'}->{'indexfieldmap'}->{$longfield};
+    if (defined $self->{'build_cfg'}->{'extraindexfields'}) {
+    foreach my $longfield (@{$self->{'build_cfg'}->{'extraindexfields'}}){
+        my $shortfield = $self->{'buildproc'}->{'fieldnamemap'}->{$longfield};
         next if $shortfield eq 1;
         
@@ -743 +742 @@
     
     #add all fields bit 
-    my $ifm = $self->{'buildproc'}->{'indexfieldmap'};
+    my $fnm = $self->{'buildproc'}->{'fieldnamemap'};
     
     foreach $field (@specifiedfieldorder) {
     if ($field eq "metadata") {
-        foreach my $newfield (keys %{$self->{'buildproc'}->{'indexfields'}}) {
+        foreach my $newfield (keys %{$self->{'buildproc'}->{'extraindexfields'}}) {
         if (!defined $specifiedfields->{$newfield}) {
-            push (@indexfieldmap, "$newfield\-\>$self->{'buildproc'}->{'indexfieldmap'}->{$newfield}");
+            push (@indexfieldmap, "$newfield\-\>$fnm->{$newfield}");
             push (@indexfields, "$newfield");
         }
@@ -762 +761 @@
     } else {
         # we only add in the ones that have been processed
-        if (defined $ifm->{$field}) {
-        push (@indexfieldmap, "$field\-\>$ifm->{$field}");
+        if (defined $self->{'buildproc'}->{'allindexfields'}->{$field}) {
+        push (@indexfieldmap, "$field\-\>$fnm->{$field}");
         push (@indexfields, "$field");
         }