Changeset 32098 for gs3-extensions/solr

Timestamp:

2017-12-12T19:36:16+13:00 (6 years ago)

Author:

ak19

Message:

Fix to solr facets: if there are 2 values assigned for a metadata of a doc, e.g. a doc's subjects meta is set to youth, and another subjects meta for that doc is set to food, it used to appear under solr's subjects facet as a new, single term called 'youth food'. But now each distinct value for that meta is indexed as a separate field with a separate value, despite the same field name (the meta, e.g. subjects). In order for this to work, the schema.xml.in, which gets copied into a solr col's etc/conf folder, needed to specify that the dynamic field for by* is multivalued (previously set to false, now true) to allow many field elements for the same field name. Tested solr-jdbm-demo (and my simple test case). Nothing that wasn't already broken in faceted searching of solr-jdbm-demo appears broken here, but results are still different, which may be expected since there's no accumulated meta value for a doc's metadata anymore.

Location:

gs3-extensions/solr/trunk/src

Files:

• conf/schema.xml.in (modified) (1 diff)
• perllib/solrbuildproc.pm (modified) (1 diff)

gs3-extensions/solr/trunk/src/conf/schema.xml.in

@@ -250 +250 @@
 
    <!-- dynamic field for sort/facet fields, which are strings by default. ie not tokenised -->
-   <dynamicField name="by*" type="string" indexed="true" stored="false" multiValued="false" />
+   <dynamicField name="by*" type="string" indexed="true" stored="false" multiValued="true" />
 
    <!-- uncomment the following to ignore any fields that don't already match an existing 

gs3-extensions/solr/trunk/src/perllib/solrbuildproc.pm

@@ -611 +611 @@
         push (@metadata_list, @section_metadata);
         }
-        my $new_text = "";
+        # my $new_text = "";
+        # foreach my $item (@metadata_list) {
+        #   &ghtml::htmlsafe($item);
+        #   $new_text .= "$item ";
+        # }
+        # if ($new_text =~ /\S/) {
+        #   $new_text = "<field name=\"$sf_shortname\">$new_text</field>\n";
+        #   # filter the text???
+        #   $text .= "$new_text"; # add it to the main text block
+        #   print "#### new_text: $new_text\n";
+
+        #   $self->{'actualsortfields'}->{$sfield} = 1;
+        # }
+        # print "#### TEXT: $text\n";
+
         foreach my $item (@metadata_list) {
         &ghtml::htmlsafe($item);
-        $new_text .= "$item ";
-        }
-        if ($new_text =~ /\S/) {
-        $new_text = "<field name=\"$sf_shortname\">$new_text</field>\n";
+        
+        $item = "<field name=\"$sf_shortname\">$item</field>\n";
         # filter the text???
-        $text .= "$new_text"; # add it to the main text block
-        $self->{'actualsortfields'}->{$sfield} = 1;
-        }
+        $text .= "$item"; # add it to the main text block
+        #print "#### new_text: $item\n";
+        }
+        if(scalar @metadata_list > 0) {
+            $self->{'actualsortfields'}->{$sfield} = 1;
+        }
+        
     }
     }