Merge pull request #576 from UN-OCHA/develop

Hotfix search 20220207

Author: lazysoundsystem

composer.json

@@ -29,7 +29,6 @@
         "drupal/address": "^1.6",
         "drupal/admin_denied": "^1.0",
         "drupal/chosen": "^2.7",
-        "drupal/colorbox": "^1.4",
         "drupal/colors": "1.x-dev",
         "drupal/components": "^2.4",
         "drupal/conditional_fields": "^4.0@alpha",

composer.lock

@@ -2,44 +2,41 @@ uuid: 88a3df33-8b17-477e-be5b-7e8ab6183446
 langcode: en
 status: true
 dependencies:
+  config:
+    - field.storage.group.field_description
+    - field.storage.node.field_iasc_audience
+    - field.storage.node.field_document_type
+    - field.storage.node.field_oa_date
+    - field.storage.media.field_media_file
+    - field.storage.node.field_media_files
+    - field.storage.node.field_category
+    - field.storage.node.field_published_date
+    - search_api.server.default_solr_server
+    - core.entity_view_mode.node.full
   module:
     - search_api_solr
     - group
     - node
     - user
-    - media
     - taxonomy
+    - media
     - search_api
     - search_api_attachments
-  config:
-    - field.storage.node.field_iasc_audience
-    - field.storage.media.field_media_file
-    - field.storage.node.field_media_files
-    - field.storage.node.field_document_type
-    - field.storage.group.field_description
-    - field.storage.node.field_oa_date
-    - field.storage.node.field_published_date
-    - field.storage.node.field_category
-    - search_api.server.default_solr_server
-    - core.entity_view_mode.node.full
 third_party_settings:
   search_api_solr:
     finalize: false
     commit_before_finalize: false
     commit_after_finalize: false
-    multilingual:
-      limit_to_content_language: false
-      include_language_independent: true
     highlighter:
       maxAnalyzedChars: 51200
       fragmenter: regex
+      usePhraseHighlighter: true
+      highlightMultiTerm: true
+      preserveMulti: false
       regex:
         slop: 0.5
         pattern: blank
         maxAnalyzedChars: 10000
-      usePhraseHighlighter: true
-      highlightMultiTerm: true
-      preserveMulti: false
       highlight:
         mergeContiguous: false
         requireFieldMatch: false
@@ -63,6 +60,9 @@ third_party_settings:
       index_prefix: ''
       collection: ''
       timezone: ''
+    multilingual:
+      limit_to_content_language: false
+      include_language_independent: true
 _core:
   default_config_hash: UxSOP7yd3TuBoCjjk6VjP8UcKfEWhAyiAYII6ZSAJx4
 id: default_solr_index
@@ -135,6 +135,14 @@ field_settings:
     dependencies:
       config:
         - field.storage.group.field_description
+  field_document_type:
+    label: 'Document Type'
+    datasource_id: 'entity:node'
+    property_path: field_document_type
+    type: integer
+    dependencies:
+      config:
+        - field.storage.node.field_document_type
   field_iasc_audience:
     label: Audience
     datasource_id: 'entity:node'
@@ -223,7 +231,7 @@ field_settings:
     datasource_id: 'entity:node'
     property_path: title
     type: text
-    boost: !!float 8
+    boost: !!float 3
     dependencies:
       module:
         - node
@@ -287,6 +295,9 @@ processor_settings:
     excluded_private: 0
     excluded_mimes: 'audio/x-aiff image/x-jg video/x-msvideo image/x-ms-bmp image/gif image/vnd.microsoft.icon video/quicktime audio/ogg video/ogg image/png image/x-photoshop audio/x-realaudio audio/x-pn-realaudio image/x-rgb video/x-flv'
   html_filter:
+    weights:
+      preprocess_index: -3
+      preprocess_query: -6
     all_fields: false
     fields:
       - rendered_item
@@ -298,36 +309,53 @@ processor_settings:
       h2: 3
       h3: 2
       string: 2
-    weights:
-      preprocess_index: -3
-      preprocess_query: -6
   language_with_fallback: {  }
   rendered_item:
     weights:
       add_properties: 0
       pre_index_save: -10
   reverse_entity_references: {  }
+  solr_boost_more_recent:
+    weights:
+      preprocess_query: 0
+    boosts:
+      created:
+        boost: !!float 5
+        resolution: NOW
+        m: '3.16e-13'
+        a: !!float 10
+        b: 0.1
+      field_published_date:
+        boost: !!float 21
+        resolution: NOW
+        m: '3.16e-13'
+        a: !!float 10
+        b: !!float 1
   solr_date_range:
     weights:
       preprocess_index: 0
   type_boost:
+    weights:
+      preprocess_index: 0
     boosts:
       'entity:group':
-        datasource_boost: !!float 1
+        datasource_boost: !!float 0
+        bundle_boosts:
+          iasc_group: !!float 0
+          iasc_space: !!float 0
       'entity:node':
-        datasource_boost: !!float 1
+        datasource_boost: !!float 0
         bundle_boosts:
           announcement: !!float 3
+          oa_event: !!float 0
           oa_wiki_page: !!float 5
           panopoly_landing_page: !!float 8
           panopoly_page: !!float 5
-    weights:
-      preprocess_index: 0
 tracker_settings:
   default:
     indexing_order: fifo
 options:
-  index_directly: true
-  track_changes_in_references: 0
   cron_limit: 50
+  index_directly: true
+  track_changes_in_references: false
 server: default_solr_server