Changeset 33371

Timestamp:

2019-07-29T12:08:14+12:00 (4 years ago)

Author:

kjdon

Message:

separate sort and facet fields as the former needs to be single valued and the latter multi valued. also created get_or create_facetfield_shortname(), and actualfacetfields, facetfieldnamemap, to match what was done for sortfield shortnames. so we don't get duplicates of shortnames

File:

• gs3-extensions/solr/trunk/src/perllib/solrbuildproc.pm (modified) (8 diffs)

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

@@ -55 +55 @@
     my $self = new lucenebuildproc (@_);
 
+    $self->{'actualfacetfields'} = {};
+    $self->{'facetfieldnamemap'} = {};
     return bless $self, $class;
 }
@@ -149 +151 @@
 
         if (!defined $self->{'indexfieldmap'}->{$real_field}) {
-        my $shortname = $self->create_shortname($real_field);
+        my $shortname = $self->get_or_create_shortname($real_field);
         $self->{'indexfieldmap'}->{$real_field} = $shortname;
         $self->{'indexfieldmap'}->{$shortname} = 1;
@@ -179 +181 @@
         }
         else {
-            $shortname = $self->create_shortname($mfield);
+            $shortname = $self->get_or_create_shortname($mfield);
             $self->{'indexfieldmap'}->{$mfield} = $shortname;
             $self->{'indexfieldmap'}->{$shortname} = 1;
@@ -468 +470 @@
         }
         else {
-        $shortname = $self->create_shortname($real_field);
+        $shortname = $self->get_or_create_shortname($real_field);
         $new_field = 1;
         }
@@ -596 +598 @@
         }
         else {
-            $shortname = $self->create_shortname($mfield);
+            $shortname = $self->get_or_create_shortname($mfield);
             $self->{'indexfieldmap'}->{$mfield} = $shortname;
             $self->{'indexfieldmap'}->{$shortname} = 1;
@@ -646 +648 @@
     }
         
-    # only add sort fields for this section if we are indexing this section, we are doing section level indexing or this is the top section
+    # only add sort and facet fields for this section if we are indexing this section, we are doing section level indexing or this is the top section
     if ($self->{'indexing_text'} && ($sec_tag_name ne "" || $doc_section == 1 )) {
     # add sort fields if there are any
-        my $seenfields = {};
-    foreach my $sfield (@{$self->{'sortfields'}}, @{$self->{'facetfields'}}) {
+    foreach my $sfield (@{$self->{'sortfields'}}) {
         # ignore special field rank/none
         next if $sfield eq "rank" || $sfield eq "none";
-        # ignore any we have already done - we may have duplicates in the sort and facet lists
-        next if (defined $seenfields->{$sfield});
-        $seenfields->{$sfield} = 1;
-        my $sf_shortname;
-        if (defined $self->{'sortfieldnamemap'}->{$sfield}) {
-        $sf_shortname = $self->{'sortfieldnamemap'}->{$sfield};
-        }
-        else {
-        $sf_shortname = $self->create_sortfield_shortname($sfield);
-        $self->{'sortfieldnamemap'}->{$sfield} = $sf_shortname;
-        $self->{'sortfieldnamemap'}->{$sf_shortname} = 1;
-        }
+        my $sf_shortname = $self->get_or_create_sortfield_shortname($sfield);
         my @metadata_list = (); # put any metadata values in here
         foreach my $submeta (split /,/, $sfield) {
@@ -677 +667 @@
         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 = "<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";
-
+         my $new_text = "";
         foreach my $item (@metadata_list) {
-            &ghtml::htmlsafe($item);
-            if ($item =~ /\S/) {
-                $item = "<field name=\"$sf_shortname\">$item</field>\n";
-                # filter the text???
-                $text .= "$item"; # add it to the main text block
-                #print "#### new_text: $item\n";
-            }
-        }
-        if(scalar @metadata_list > 0) {
-            $self->{'actualsortfields'}->{$sfield} = 1;
-        }
-        
-    }
-    }
+            &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";
+        
+
+    }# end add in sort fields
+
+    # add facet fields if there are any
+    foreach my $sfield (@{$self->{'facetfields'}}) {
+        my $sf_shortname = $self->get_or_create_facetfield_shortname($sfield);
+        my @metadata_list = (); # put any metadata values in here
+        foreach my $submeta (split /,/, $sfield) {
+        $submeta =~ s/^ex\.([^.]+)$/$1/; #strip off ex. iff it's the only metadata set prefix (will leave ex.dc.* intact)
+        
+        my @section_metadata = @{$doc_obj->get_metadata ($section, $submeta)};
+            if ($section ne $doc_obj->get_top_section() && defined ($self->{'sections_sort_on_document_metadata'})) {
+            if ($self->{'sections_sort_on_document_metadata'} eq "always" || ( scalar(@section_metadata) == 0 && $self->{'sections_sort_on_document_metadata'} eq "unless_section_metadata_exists")) {
+                push (@section_metadata, @{$doc_obj->get_metadata ($doc_obj->get_top_section(), $submeta)});
+            }
+            }
+        push (@metadata_list, @section_metadata);
+        }
+        my $found_facet_value = 0;
+        foreach my $item (@metadata_list) {
+        &ghtml::htmlsafe($item);
+        if ($item =~ /\S/) {
+            $item = "<field name=\"$sf_shortname\">$item</field>\n";
+            # filter the text???
+            $text .= "$item"; # add it to the main text block
+            $found_facet_value = 1;
+            #print "#### new_text: $item\n";
+        }
+        }
+        if($found_facet_value) {
+            $self->{'actualfacetfields'}->{$sfield} = 1;
+        }
+        
+    }
+    } # end add in facet fields
 
     # add in end tag if at top-level doc root, or indexing at the section level
@@ -746 +756 @@
 }
 
+sub get_or_create_facetfield_shortname {
+    my $self = shift(@_);
+
+    my ($realname) = @_;
+    
+    if (defined $self->{'facetfieldnamemap'}->{$realname}) {
+    return $self->{'facetfieldnamemap'}->{$realname};
+    }
+
+    # get the shortname made for this index field
+
+    my $shortname = $self->get_or_create_shortname($realname);
+    $shortname = "fc".$shortname;
+
+    $self->{'facetfieldnamemap'}->{$realname} = $shortname;
+    $self->{'facetfieldnamemap'}->{$shortname} = 1;
+    return $shortname;
+}
+  
+
 
 1;