Skip to content

Commit

Permalink
Fix nested query in Solr 7.7
Browse files Browse the repository at this point in the history
Co-authored-by: Anna Headley <anna3LC@gmail.com>
  • Loading branch information
tpendragon and hackartisan committed Sep 11, 2019
1 parent fdd5f95 commit 1d86912
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .solr_wrapper
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Place any default configuration for solr_wrapper here
port: 8983
version: 7.1.0
version: 7.7.0
collection:
dir: solr/config/
name: blacklight-core
Expand Down
10 changes: 6 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ GEM
modernizr-rails (2.7.1)
msgpack (1.2.4)
multi_json (1.12.1)
multipart-post (2.0.0)
multipart-post (2.1.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (5.1.0)
Expand Down Expand Up @@ -410,6 +410,7 @@ GEM
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
retriable (3.1.2)
riiif (1.1.0)
railties (>= 4.2, < 6)
roar (1.1.0)
Expand Down Expand Up @@ -451,8 +452,8 @@ GEM
rubocop (>= 0.52.1)
ruby-oembed (0.10.1)
ruby-prof (0.16.2)
ruby-progressbar (1.8.1)
rubyzip (1.2.2)
ruby-progressbar (1.10.1)
rubyzip (1.2.4)
safe_yaml (1.0.4)
sass (3.4.25)
sass-rails (5.0.6)
Expand Down Expand Up @@ -503,8 +504,9 @@ GEM
concurrent-ruby (~> 1.0)
serverengine (~> 2.0.5)
thor
solr_wrapper (0.18.1)
solr_wrapper (2.1.0)
faraday
retriable
ruby-progressbar
rubyzip
spring (2.0.0)
Expand Down
1 change: 1 addition & 0 deletions app/models/search_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def hide_parented_resources(solr_params)
# @param solr_params [Blacklight::Solr::Request] the Solr query parameters being modified
def join_from_parent(solr_params)
parent_query = solr_params[:q]
solr_params[:defType] = "lucene"
solr_params[:q] = JoinChildrenQuery.new(parent_query).to_s
end
end

0 comments on commit 1d86912

Please sign in to comment.