Skip to content

Commit 5f83a8a

Browse files
authored
Merge pull request #539 from UN-OCHA/feature/IASC-675-search-results
Feature/iasc 675 search results
2 parents 78801df + 0c4c2dc commit 5f83a8a

6 files changed

+205
-118
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
"drupal/select_or_other": "^4.0",
7878
"drupal/social_auth_hid": "^3.0",
7979
"drupal/spamspan": "^1.2",
80+
"drupal/stage_file_proxy": "^1.1",
8081
"drupal/tablefield": "^2.1",
8182
"drupal/token": "^1.5",
8283
"drupal/token_filter": "^1.2",
@@ -103,7 +104,6 @@
103104
"drupal/config_filter": "^2.2",
104105
"drupal/core-dev": "^9.2.6",
105106
"drupal/devel": "^4.1",
106-
"drupal/stage_file_proxy": "^1.1",
107107
"drupal/upgrade_rector": "1.x-dev@dev",
108108
"drupal/upgrade_status": "^3.8",
109109
"kint-php/kint": "^3.3",

composer.lock

+89-82
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/config_split.config_split.config_dev.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ id: config_dev
66
label: config_dev
77
description: 'Dev modules and settings not suitable for production.'
88
weight: 0
9+
stackable: false
910
storage: folder
1011
folder: ../config_dev
1112
module:

config/search_api.index.default_solr_index.yml

+29-30
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies:
2121
- field.storage.node.field_published_date
2222
- field.storage.node.field_category
2323
- search_api.server.default_solr_server
24-
- core.entity_view_mode.node.search_index
24+
- core.entity_view_mode.node.full
2525
third_party_settings:
2626
search_api_solr:
2727
finalize: false
@@ -56,6 +56,9 @@ third_party_settings:
5656
maxntp: 2000
5757
boost: false
5858
interestingTerms: none
59+
term_modifiers:
60+
slop: 3
61+
fuzzy: 1
5962
advanced:
6063
index_prefix: ''
6164
collection: ''
@@ -132,22 +135,6 @@ field_settings:
132135
dependencies:
133136
config:
134137
- field.storage.group.field_description
135-
field_document_type:
136-
label: 'Document Type'
137-
datasource_id: 'entity:node'
138-
property_path: field_document_type
139-
type: integer
140-
dependencies:
141-
config:
142-
- field.storage.node.field_document_type
143-
field_iasc_audience:
144-
label: Audience
145-
datasource_id: 'entity:node'
146-
property_path: field_iasc_audience
147-
type: integer
148-
dependencies:
149-
config:
150-
- field.storage.node.field_iasc_audience
151138
field_oa_date:
152139
label: 'Event date'
153140
datasource_id: 'entity:node'
@@ -198,9 +185,17 @@ field_settings:
198185
roles:
199186
anonymous: anonymous
200187
view_mode:
188+
'entity:group':
189+
iasc_group: default
190+
iasc_space: default
201191
'entity:node':
202-
article: search_index
203-
page: search_index
192+
action_point: full
193+
announcement: full
194+
oa_event: full
195+
oa_wiki_page: full
196+
oa_worktracker_task: default
197+
panopoly_landing_page: full
198+
panopoly_page: full
204199
saa_field_media_files:
205200
label: 'Search api attachments: Media field for file'
206201
property_path: saa_field_media_files
@@ -215,14 +210,6 @@ field_settings:
215210
dependencies:
216211
module:
217212
- node
218-
sticky:
219-
label: 'Sticky at top of lists'
220-
datasource_id: 'entity:node'
221-
property_path: sticky
222-
type: boolean
223-
dependencies:
224-
module:
225-
- node
226213
title:
227214
label: Title
228215
datasource_id: 'entity:node'
@@ -262,12 +249,9 @@ datasource_settings:
262249
bundles:
263250
default: false
264251
selected:
265-
- action_point
266252
- announcement
267-
- oa_discussion_post
268253
- oa_event
269254
- oa_wiki_page
270-
- oa_worktracker_task
271255
- panopoly_landing_page
272256
- panopoly_page
273257
languages:
@@ -314,13 +298,28 @@ processor_settings:
314298
weights:
315299
add_properties: 0
316300
pre_index_save: -10
301+
reverse_entity_references: { }
317302
solr_date_range:
318303
weights:
319304
preprocess_index: 0
305+
type_boost:
306+
boosts:
307+
'entity:group':
308+
datasource_boost: !!float 1
309+
'entity:node':
310+
datasource_boost: !!float 1
311+
bundle_boosts:
312+
announcement: !!float 3
313+
oa_wiki_page: !!float 5
314+
panopoly_landing_page: !!float 8
315+
panopoly_page: !!float 5
316+
weights:
317+
preprocess_index: 0
320318
tracker_settings:
321319
default:
322320
indexing_order: fifo
323321
options:
324322
index_directly: true
323+
track_changes_in_references: 0
325324
cron_limit: 50
326325
server: default_solr_server

config/views.view.search_content.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ display:
7676
'entity:node':
7777
action_point: teaser
7878
announcement: teaser
79-
contact: teaser
80-
oa_discussion_post: teaser
8179
oa_event: teaser
8280
oa_wiki_page: teaser
8381
oa_worktracker_task: teaser
@@ -135,10 +133,10 @@ display:
135133
fields: { }
136134
plugin_id: search_api_fulltext
137135
sorts:
138-
field_published_date:
139-
id: field_published_date
136+
search_api_relevance:
137+
id: search_api_relevance
140138
table: search_api_index_default_solr_index
141-
field: field_published_date
139+
field: search_api_relevance
142140
relationship: none
143141
group_type: group
144142
admin_label: ''
@@ -177,6 +175,7 @@ display:
177175
relationships: { }
178176
arguments: { }
179177
display_extenders: { }
178+
fields: { }
180179
cache_metadata:
181180
contexts:
182181
- 'languages:language_interface'

0 commit comments

Comments
 (0)