Changeset 27815 for gs3-extensions/solr/trunk

Timestamp:

2013-07-11T16:15:43+12:00 (11 years ago)

Author:

kjdon

Message:

adding in facets

Location:

gs3-extensions/solr/trunk/src/perllib

Files:

• solrbuilder.pm (modified) (2 diffs)
• solrbuildproc.pm (modified) (2 diffs)

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

@@ -618 +618 @@
     $self->{'buildproc'}->set_sortfields ($self->{'collect_cfg'}->{'sortfields'});
     }
+    if (defined $self->{'collect_cfg'}->{'facetfields'}) {
+    $self->{'buildproc'}->set_facetfields ($self->{'collect_cfg'}->{'facetfields'});
+    }
     $self->{'buildproc'}->set_db_level($db_level);
     $self->{'buildproc'}->reset();
@@ -659 +662 @@
 }    
 
-
+sub build_cfg_extra {
+    my $self = shift (@_);
+    my ($build_cfg) = @_;
+
+    $self->lucenebuilder::build_cfg_extra($build_cfg);
+
+    # need to add in facet stuff
+    my @facetfields = ();
+    my @facetfieldmap = ();
+
+    foreach my $sf (@{$self->{'buildproc'}->{'facetfields'}}) {
+    if ($sf eq "rank") {
+        push(@facetfields, $sf);
+    } elsif ($self->{'buildproc'}->{'actualsortfields'}->{$sf}) {
+        my $shortname = $self->{'buildproc'}->{'sortfieldnamemap'}->{$sf};
+        push(@facetfields, $shortname);
+        push (@facetfieldmap, "$sf\-\>$shortname");
+    }
+    
+    }
+    $build_cfg->{'indexfacetfields'} = \@facetfields;
+    $build_cfg->{'indexfacetfieldmap'} = \@facetfieldmap;
+}  
 1;
 

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

@@ -58 +58 @@
 }
 
+sub set_facetfields {
+    my $self = shift (@_);
+ 
+    my ($facetfields) = @_;
+    $self->{'facetfields'} = ();
+    # lets just go through and check for text, allfields, metadata which are only valid for indexes, not for facetfields
+    foreach my $s (@$facetfields) {
+    if ($s !~ /^(text|allfields|metadata)$/) {
+        push (@{$self->{'facetfields'}}, $s);
+    }
+    }
+}
 
 #----
@@ -557 +569 @@
     if ($self->{'indexing_text'} && ($sec_tag_name ne "" || $doc_section == 1 )) {
     # add sort fields if there are any
-        
-    foreach my $sfield (@{$self->{'sortfields'}}) {
+        my $seenfields = {};
+    foreach my $sfield (@{$self->{'sortfields'}}, @{$self->{'facetfields'}}) {
+        print STDERR "sort/facet field = $sfield\n";
         # ignore special field rank
         next if $sfield eq "rank";
+        # ignore any we have already done - we may have duplicates in the sort and facet lists
+        next if (defined $seenfields->{$sfield});
+        print STDERR "processing it\n";
+        $seenfields->{$sfield} = 1;
         my $sf_shortname;
         if (defined $self->{'sortfieldnamemap'}->{$sfield}) {