+ when '1987-88'
+
+
+
+
+
+
+
+
+
+
+ '[1987-06-16T23:00:00Z TO 1988-11-21T23:59:59Z]'
+
+
+
+
+
+
+
+
+
+
+ when '1986-87'
+
+
+
+
+
+
+
+
+
+
+ '[1986-11-12T00:00:00Z TO 1987-06-16T22:59:59Z]'
+
+
+
+
+
+
+
+
+
+
+ when '1985-86'
+
+
+
+
+
+
+
+
+
+
+ '[1985-11-05T00:00:00Z TO 1986-11-11T23:59:59Z]'
+
+
+
+
+
+
+
+
+
+
+ when '1984-85'
+
+
+
+
+
+
+
+
+
+
+ '[1984-11-06T00:00:00Z TO 1985-11-04T23:59:59Z]'
+
+
+
+
+
+
+
+
+
+
+ when '1983-84'
+
+
+
+
+
+
+
+
+
+
+ '[1983-06-14T23:00:00Z TO 1984-11-05T23:59:59Z]'
+
+
+
+
+
+
+
+
+
+
+ when '1982-83'
+
+
+
+
+
+
+
+
+
+
+ '[1982-11-03T00:00:00Z TO 1983-06-14T22:59:59Z]'
+
+
+
+
+
+
+
+
+
+
+ when '1981-82'
+
+
+
+
+
+
+
+
+
+
+ '[1981-11-04T00:00:00Z TO 1982-11-02T23:59:59Z]'
+
+
+
+
+
+
+
+
+
+
+ when '1980-81'
+
+
+
+
+
+
+
+
+
+
+ '[1980-11-20T00:00:00Z TO 1981-11-03T23:59:59Z]'
+
+
+
+
+
+
+
+
+
+
+ when '1979-80'
+
+
+
+
+
+
+
+
+
+
+ '[1979-05-08T23:00:00Z TO 1980-11-19T23:59:59Z]'
+
+
+
+
+
+
+
+
+
+
+ else
+
+
+
+
+
+
+
+
+
+
+ ''
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ def sort
+
+
+
+
+
+ 3
+
+
+
+
+ return 'date_dt desc' if sort_by == "date_desc"
+
+
+
+
+
+ 2
+
+
+
+
+ return 'date_dt asc' if sort_by == "date_asc"
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ 'date_dt desc'
+
+
+
+
+
+
+
+
+
+
end
-
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ def facet_hash
+
+
+
+
+
+
+
+
+
+
+ # hash with keys as names of facets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ret = {}
+
+
+
+
+
+
+
+
+
+
+ SolrSearch.facet_fields.each do |field_name|
+
+
+
+
+
+
+
+
+
+
+ ret[field_name] = {
+
+
+
+
+
+
+
+
+
+
+ "type" => facet_type(field_name),
+
+
+
+
+
+
+
+
+
+
+ "field" => field_name,
+
+
+
+
+
+
+
+
+
+
+ "limit" => facet_limit(field_name),
+
+
+
+
+
+
+
+
+
+
+ "mincount" => facet_mincount(field_name),
+
+
+
+
+
+
+
+
+
+
+ "domain" => { excludeTags: field_name }
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ if filter&.dig(:year).present?
+
+
+
+
+
+
+
+
+
+
+ year = filter.dig(:year).first
+
+
+
+
+
+
+
+
+
+
+ ret['month'] = {
+
+
+
+
+
+
+
+
+
+
+ "type": "range",
+
+
+
+
+
+
+
+
+
+
+ "field": "date_dt",
+
+
+
+
+
+
+
+
+
+
+ "start": "#{year}-01-01T00:00:00Z",
+
+
+
+
+
+
+
+
+
+
+ "end": "#{year}-12-31T23:59:59Z",
+
+
+
+
+
+
+
+
+
+
+ "gap": "+1MONTH",
+
+
+
+
+
+
+
+
+
+
+ "mincount": 0,
+
+
+
+
+
+
+
+
+
+
+ "domain": { excludeTags: 'month' }
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+ else
+
+
+
+
+
+
+
+
+
+
+ ret['year'] = {
+
+
+
+
+
+
+
+
+
+
+ "type": "range",
+
+
+
+
+
+
+
+
+
+
+ "field": "date_dt",
+
+
+
+
+
+
+
+
+
+
+ "start": "1500-01-01T00:00:00Z",
+
+
+
+
+
+
+
+
+
+
+ "end": "#{Date.today.strftime("%Y-%m-%d")}T23:59:59Z",
+
+
+
+
+
+
+
+
+
+
+ "gap": "+1YEAR",
+
+
+
+
+
+
+
+
+
+
+ "mincount": 1,
+
+
+
+
+
+
+
+
+
+
+ "limit": 100
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SolrSearch.sessions.each do |session|
+
+
+
+
+
+
+
+
+
+
+ ret["session_#{session}"] = {
+
+
+
+
+
+
+
+
+
+
+ "type": "query",
+
+
+
+
+
+
+
+
+
+
+ "q": "(session_t:#{session} OR date_dt:#{session_range_lookup(session)})",
+
+
+
+
+
+
+
+
+
+
+ "domain": { excludeTags: 'session_t' }
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ret.to_json
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ def facet_type(field_name)
+
+
+
+
+
+
+
+
+
+
+ arr = []
+
+
+
+
+
+
+
+
+
+
+ return "terms" unless arr.include?(field_name)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ " " # replacement type
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ def facet_limit(field_name)
+
+
+
+
+
+
+
+
+
+
+ # limit to 80 except for
+
+
+
+
+
+
+
+
+
+
+ facet_names = ["type_sesrollup"]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ return 80 unless facet_names.include?(field_name)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ def facet_mincount(field_name)
+
+
+
+
+
+
+
+
+
+
+ arr = []
+
+
+
+
+
+
+
+
+
+
+ return 1 unless arr.include?(field_name)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0 # replacement mincount
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ def self.sessions
+
+
+
+
+
+
+
+
+
+
+ [
+
+
+
+
+
+ 9
+
+
+
+
+ '2024-25',
+
+
+
+
+
+
+
+
+
+
+ '2023-24',
+
+
+
+
+
+
+
+
+
+
+ '2022-23',
+
+
+
+
+
+
+
+
+
+
+ '2021-22',
+
+
+
+
+
+
+
+
+
+
+ '2019-21',
+
+
+
+
+
+
+
+
+
+
+ '2019-19',
+
+
+
+
+
+
+
+
+
+
+ '2017-19',
+
+
+
+
+
+
+
+
+
+
+ '2016-17',
+
+
+
+
+
+
+
+
+
+
+ '2015-16',
+
+
+
+
+
+
+
+
+
+
+ '2014-15',
+
+
+
+
+
+
+
+
+
+
+ '2013-14',
+
+
+
+
+
+
+
+
+
+
+ '2012-13',
+
+
+
+
+
+
+
+
+
+
+ '2010-12',
+
+
+
+
+
+
+
+
+
+
+ '2009-10',
+
+
+
+
+
+
+
+
+
+
+ '2008-09',
+
+
+
+
+
+
+
+
+
+
+ '2007-08',
+
+
+
+
+
+
+
+
+
+
+ '2006-07',
+
+
+
+
+
+
+
+
+
+
+ '2005-06',
+
+
+
+
+
+
+
+
+
+
+ '2004-05',
+
+
+
+
+
+
+
+
+
+
+ '2003-04',
+
+
+
+
+
+
+
+
+
+
+ '2002-03',
+
+
+
+
+
+
+
+
+
+
+ '2001-02',
+
+
+
+
+
+
+
+
+
+
+ '2000-01',
+
+
+
+
+
+
+
+
+
+
+ '1999-00',
+
+
+
+
+
+
+
+
+
+
+ '1998-99',
+
+
+
+
+
+
+
+
+
+
+ '1997-98',
+
+
+
+
+
+
+
+
+
+
+ '1996-97',
+
+
+
+
+
+
+
+
+
+
+ '1995-96',
+
+
+
+
+
+
+
+
+
+
+ '1994-95',
+
+
+
+
+
+
+
+
+
+
+ '1993-94',
+
+
+
+
+
+
+
+
+
+
+ '1992-93',
+
+
+
+
+
+
+
+
+
+
+ '1991-92',
+
+
+
+
+
+
+
+
+
+
+ '1990-91',
+
+
+
+
+
+
+
+
+
+
+ '1989-90',
+
+
+
+
+
+
+
+
+
+
+ '1988-89',
+
+
+
+
+
+
+
+
+
+
+ '1987-88',
+
+
+
+
+
+
+
+
+
+
+ '1986-87',
+
+
+
+
+
+
+
+
+
+
+ '1985-86',
+
+
+
+
+
+
+
+
+
+
+ '1984-85',
+
+
+
+
+
+
+
+
+
+
+ '1983-84',
+
+
+
+
+
+
+
+
+
+
+ '1982-83',
+
+
+
+
+
+
+
+
+
+
+ '1981-82',
+
+
+
+
+
+
+
+
+
+
+ '1980-81',
+
+
+
+
+
+
+
+
+
+
+ '1979-80'
+
+
+
+
+
+
+
+
+
+
+ ]
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ private
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ def search_params
+
+
+
+
+
+
+
+
+
+
+ {
+
+
+
+
+
+
+
+
+
+
+ q: search_query,
+
+
+
+
+
+
+
+
+
+
+ 'q.op': 'AND',
+
+
+
+
+
+
+
+
+
+
+ fq: search_filter,
+
+
+
+
+
+
+
+
+
+
+ start: start,
+
+
+
+
+
+
+
+
+
+
+ rows: rows,
+
+
+
+
+
+
+
+
+
+
+ sort: sort,
+
+
+
+
+
+
+
+
+
+
+ 'json.facet': facet_hash
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+ end
+
+
+
+
+
diff --git a/spec/models/search_data_spec.rb b/spec/models/search_data_spec.rb
index 98f5629..592cfdf 100644
--- a/spec/models/search_data_spec.rb
+++ b/spec/models/search_data_spec.rb
@@ -2,7 +2,7 @@
RSpec.describe SearchData, type: :model do
let(:search_data) { SearchData.new(search_output) }
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'], query: 'horse' },
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'], query: 'horse' },
data: {
"responseHeader" => {
"status" => 0,
@@ -21,8 +21,8 @@
"highlighting" => { "test_url" => {} },
"facets" => {
"count" => 1234,
- "type_ses" => { "buckets" => [{ "val" => 90996, "count" => 123 }, { "val" => 90995, "count" => 234 }] },
- "subtype_ses" => { "buckets" => [{ "val" => 123456, "count" => 455 }, { "val" => 234556, "count" => 66 }] }
+ "topic_ses" => { "buckets" => [{ "val" => 90996, "count" => 123 }, { "val" => 90995, "count" => 234 }] },
+ "subject_ses" => { "buckets" => [{ "val" => 123456, "count" => 455 }, { "val" => 234556, "count" => 66 }] }
}
},
}
@@ -40,7 +40,7 @@
end
end
context 'when an error code is present' do
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'] }, data: { "code" => 500, "msg" => "error_message" } } }
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'] }, data: { "code" => 500, "msg" => "error_message" } } }
it 'returns true' do
expect(search_data.solr_error?).to be true
end
@@ -54,7 +54,7 @@
end
end
context 'when an error code is present' do
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'] }, data: { "code" => 500, "msg" => "error_message" } } }
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'] }, data: { "code" => 500, "msg" => "error_message" } } }
it 'returns the message' do
expect(search_data.error_message).to eq('error_message')
end
@@ -68,7 +68,7 @@
end
end
context 'when an error code is present' do
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'] }, data: { "code" => 500, "msg" => "error_message" } } }
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'] }, data: { "code" => 500, "msg" => "error_message" } } }
it 'returns the code' do
expect(search_data.error_code).to eq(500)
end
@@ -82,7 +82,7 @@
end
end
context 'when an error code is present' do
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'] }, data: { "code" => 500, "msg" => "error_message" } } }
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'] }, data: { "code" => 500, "msg" => "error_message" } } }
it 'returns the partial path' do
expect(search_data.error_partial_path).to eq('layouts/shared/error/500')
end
@@ -100,7 +100,7 @@
end
end
context 'where data is missing' do
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'] },
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'] },
data: { "responseHeader" => {
"status" => 0,
"QTime" => 4,
@@ -126,7 +126,7 @@
end
end
context 'where data is missing' do
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'] },
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'] },
data: { "responseHeader" => {
"status" => 0,
"QTime" => 4,
@@ -153,7 +153,7 @@
end
context 'where no data is present' do
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'] } } }
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'] } } }
it 'returns nil' do
expect(search_data.number_of_results).to be nil
@@ -169,7 +169,7 @@
end
context 'where no query is present' do
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'] } } }
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'] } } }
it 'returns nil' do
expect(search_data.query).to be nil
@@ -194,9 +194,9 @@
describe 'filter' do
context 'where data is present' do
- let!(:search_output) { { search_parameters: { filter: ['type_ses:12345'] } } }
+ let!(:search_output) { { search_parameters: { filter: ['topic_ses:12345'] } } }
it 'returns an array of filter strings' do
- expect(search_data.filter).to eq(["type_ses:12345"])
+ expect(search_data.filter).to eq(["topic_ses:12345"])
end
end
@@ -272,11 +272,11 @@
end
it 'includes the field name string' do
- expect(search_data.facets.pluck(:field_name)).to eq(["type_ses", "subtype_ses"])
+ expect(search_data.facets.pluck(:field_name)).to match_array(["topic_ses", "subject_ses"])
end
it 'includes facets sorted by count (descending)' do
- expect(search_data.facets.pluck(:facets)).to eq([[{ "count" => 234, "val" => 90995 }, { "count" => 123, "val" => 90996 }], [{ "count" => 455, "val" => 123456 }, { "count" => 66, "val" => 234556 }]])
+ expect(search_data.facets.pluck(:facets)).to eq([[{ "count" => 455, "val" => 123456 }, { "count" => 66, "val" => 234556 }], [{ "count" => 234, "val" => 90995 }, { "count" => 123, "val" => 90996 }]])
end
end
end
