Changeset 33327 for main/trunk

Timestamp:

2019-07-18T22:45:22+12:00 (5 years ago)

Author:

ak19

Message:

In order to get map coordinate metadata stored correctly in solr, changes were required. These changes revealed that the way in which some index fields were stored in solr but also lucene were not exactly correct and required changing too. 1. Coordinate/CD, CoordShort/CS and GPSMapOverlayLabel/ML meta are now being stored. The schema elements created for these indexed fields notably need to say they're multivalued (multiple values per docOID) and are of type=string rather than type=text_en_splitting as the other meta have been so far. No term related information being stored for them as that doesn't appear important for these indexed fields. 2. Changes to solrbuildproc required and these changes were also repeated into lucenebuildproc: in their code before this commit, <field name=... /> elements were stored once for all meta elements in that field. It sort of worked out so far since the type=text_en_splitting for these fields. This however created the problem that for example all Coordinate meta for a docOID went into a single <field name=CD .../> element separate by spaces rather than a <field name=CD .../> element for each Coordinate meta. We wanted the latter behaviour for CD, CS and ML meta but also for all other indexed meta fields such as TI for titles. But also for indexed fields that include multiple meta in one index such as a hypothetical TT where TT would include dc.Title,ex.Title,text. In that case too we want a <field name=TT /> element for each title meta and for the text meta. 3. The num_processed_bytes calculation is left untouched and still includes the encapsulating <field name=.../> element and has not been changed to be calculated over just the meta data value of each field. This is because not only is it calculated to include the field in super -buildproc.pm classes, but also because the definition of num_processed_bytes in basebuilder.pm is defined as the number of bytes actually passed to (mg) for the current index, where lucene and mgpp buildprocs both include the enclosing element in the calculation which seems deliberate. Further, num_processed_bytes contrasts against num_bytes, declared and defined in basebuildproc.pm too as The actual number of bytes in the collection, normally the same as what's processed during text compression. num_bytes seems to be what Dr Bainbridge had in mind today when he said that actually the enclosing <field/> element shouldn't be included in the calculation of num_processed_bytes. Since the definition of num_processed_bytes seems ambiguous to me now, I leave it alone until discussed with Dr Bainbridge again, as there are many places where it needs changing otherwise.

File:

• main/trunk/greenstone2/perllib/lucenebuildproc.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/lucenebuildproc.pm

@@ -260 +260 @@
         
         if ($section_text ne "") {
-            $new_text .= "$section_text ";
+            
+            if ($self->{'allfields_index'}) {
+                $allfields_text .= "$section_text ";
+            }
+            
+            if ($self->{'indexing_text'}) {
+                # add the tag
+                $new_text .= "<$shortname index=\"1\">$section_text</$shortname>";
+                $self->{'allindexfields'}->{$real_field} = 1;
+            } else {
+                $new_text .= "$section_text ";
+            }
         }
         
         foreach my $item (@metadata_list) {
             &ghtml::htmlsafe($item);
-            $new_text .= "$item ";
-        }
-
-        if ($self->{'allfields_index'}) {
-            $allfields_text .= $new_text;
-        }
-
-        if ($self->{'indexing_text'}) {
-            # add the tag
-            $new_text = "<$shortname index=\"1\">$new_text</$shortname>";
-            $self->{'allindexfields'}->{$real_field} = 1;
-        }
+
+            if ($self->{'allfields_index'}) {
+                $allfields_text .= "$item ";
+            }
+
+            if ($self->{'indexing_text'}) {
+                # add the tag
+                $new_text .= "<$shortname index=\"1\">$item</$shortname>";
+                $self->{'allindexfields'}->{$real_field} = 1;
+            } else {
+                $new_text .= "$item ";
+            }
+        } # end for loop processing @metadata_list
+        
         # filter the text
         $new_text = $self->filter_text ($field, $new_text);
@@ -384 +397 @@
         push (@metadata_list, @section_metadata);
         }
-        my $new_text = "";
-        foreach my $item (@metadata_list) {
-        &ghtml::htmlsafe($item);
-        $new_text .= "$item";
-        }
-        if ($new_text =~ /\S/) {
-        $new_text = "<$sf_shortname index=\"1\" tokenize=\"0\">$new_text</$sf_shortname>";
-        # filter the text???
-        $text .= "$new_text"; # add it to the main text block
-        $self->{'actualsortfields'}->{$sfield} = 1;
+        # my $new_text = "";
+        # foreach my $item (@metadata_list) {
+        # &ghtml::htmlsafe($item);
+        # $new_text .= "$item"; # should be .="$item "; But will be commenting out and rewriting this entire thing, so it doesn't matter
+        # }
+        # if ($new_text =~ /\S/) {
+        # $new_text = "<$sf_shortname index=\"1\" tokenize=\"0\">$new_text</$sf_shortname>";
+        # # filter the text???
+        # $text .= "$new_text"; # add it to the main text block
+        # $self->{'actualsortfields'}->{$sfield} = 1;
+        # }
+        
+        foreach my $item (@metadata_list) {
+            &ghtml::htmlsafe($item);
+            if ($item =~ /\S/) {
+                $item = "<$sf_shortname index=\"1\" tokenize=\"0\">$item</$sf_shortname>";
+                $text .= "$item"; # add it to the main text block
+            }
+        }
+        if(scalar @metadata_list > 0) {
+            $self->{'actualsortfields'}->{$sfield} = 1;
         }
     }