Download as
Browse Code »

Commit af6235af6d4a43103a690f7fc226eb6b72eee969

Authored by Braulio Bhavamitra
1 parent e8a40c88
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Update fixes from acts_as_solr_reloaded

Showing 1 changed file with 14 additions and 6 deletions   Show diff stats
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb
  Diff comments   View file @af6235a
@@ -16,14 +16,23 @@ module ActsAsSolr #:nodoc: @@ -16,14 +16,23 @@ module ActsAsSolr #:nodoc:
16 begin 16 begin
17 Deprecation.validate_query(options) 17 Deprecation.validate_query(options)
18 18
19 - if options[:alternate_query]  
20 - query = query.blank? ? '*:*' : sanitize_query(query)  
21 - query = "#{options[:alternate_query]} #{query}" 19 + query_options[:filter_queries] ||= []
  20 + options[:alternate_query] ||= ''
  21 + options[:alternate_query].strip!
  22 + query.strip!
  23 +
  24 + # using *:* disable index boosts, so use the type filter
  25 + if query.blank?
  26 + query = solr_type_condition(options)
22 else 27 else
23 - query = query.blank? ? '*:*' : sanitize_query(query) 28 + query = sanitize_query(query)
  29 + query_options[:filter_queries] = [solr_type_condition(options)]
  30 +
  31 + # put types on filtered fields
  32 + query = replace_types([*query], ':').first
24 end 33 end
25 34
26 - query = replace_types([*query], ':').first # put types on filtered fields 35 + query = "#{options[:alternate_query]} #{query}" unless options[:alternate_query].blank?
27 query = add_relevance query, options[:relevance] 36 query = add_relevance query, options[:relevance]
28 query_options[:query] = query 37 query_options[:query] = query
29 38
@@ -37,7 +46,6 @@ module ActsAsSolr #:nodoc: @@ -37,7 +46,6 @@ module ActsAsSolr #:nodoc:
37 46
38 query_options[:operator] = options[:operator] 47 query_options[:operator] = options[:operator]
39 48
40 - query_options[:filter_queries] = [solr_type_condition(options)]  
41 query_options[:filter_queries] += replace_types([*options[:filter_queries]], '') if options[:filter_queries] 49 query_options[:filter_queries] += replace_types([*options[:filter_queries]], '') if options[:filter_queries]
42 50
43 query_options[:boost_functions] = replace_types([*options[:boost_functions]], '').join(' ') if options[:boost_functions] 51 query_options[:boost_functions] = replace_types([*options[:boost_functions]], '').join(' ') if options[:boost_functions]