Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/graphql/types/query_type.rb
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ def record_id(id:, index:)
def search(searchterm:, citation:, contributors:, funding_information:, geodistance:, geobox:, identifiers:,
locations:, subjects:, title:, index:, source:, from:, boolean_type:, fulltext:, per_page: 20,
query_mode: 'keyword', use_global_scoring: false, tuning_parameters_input: nil, **filters)
Rails.logger.info("Searchterm: #{format_searchterm_for_log(searchterm)}")

query = construct_query(searchterm, citation, contributors, funding_information, geodistance, geobox, identifiers,
locations, subjects, title, source, boolean_type, filters, per_page, query_mode)

Expand Down Expand Up @@ -204,6 +206,12 @@ def source_deprecation_handler(query, new_source, old_source)
query
end

def format_searchterm_for_log(searchterm)
return '[missing]' if searchterm.blank?

searchterm.to_s.truncate(200)
end

def validate_and_build_semantic_options(tuning_parameters)
return {} if tuning_parameters.blank?

Expand Down
2 changes: 1 addition & 1 deletion config/initializers/filter_parameter_logging.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# Use this to limit dissemination of sensitive information.
# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
Rails.application.config.filter_parameters += [
:passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc
:passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc, :query
]