From f27ec931ede9488c0b57c2b898f9eeb958761588 Mon Sep 17 00:00:00 2001
From: Richard Davies <richard.davies@portlandoregon.gov>
Date: Fri, 26 Apr 2024 08:20:11 -0700
Subject: [PATCH] PE-601 Update Solr schema (#578)

---
 .circleci/config.yml                     |  3 +++
 private/solr-conf/schema.xml             |  2 +-
 private/solr-conf/schema_extra_types.xml |  2 +-
 private/solr-conf/solrconfig.xml         | 18 +++++++++---------
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 632558430..79d569bc0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -245,6 +245,9 @@ build_and_deploy: &build_and_deploy
           echo "Rebuilding cache..."
           terminus drush $CIRCLE_PROJECT_REPONAME.$PANTHEON_ENV -- cr
 
+          # Post our custom Solr schema to Pantheon's Solr server
+          terminus drush $CIRCLE_PROJECT_REPONAME.$PANTHEON_ENV -- search-api-pantheon:postSchema pantheon_solr8 ../private/solr-conf
+          
           if [[ $CIRCLE_BRANCH != "master" ]]; then
             # Begin indexing the Solr server. For new multidevs, indexing will take some time
             # and will continue running after the CircleCI build finishes.
diff --git a/private/solr-conf/schema.xml b/private/solr-conf/schema.xml
index d17b2d48a..62067d36d 100644
--- a/private/solr-conf/schema.xml
+++ b/private/solr-conf/schema.xml
@@ -49,7 +49,7 @@
     that avoids logging every request
 -->
 
-<schema name="drupal-4.3.1-solr-8.x-0" version="1.6">
+<schema name="drupal-4.3.3-solr-8.x-0" version="1.6">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
        version="x.y" is Solr's version number for the schema syntax and
        semantics.  It should not normally be changed by applications.
diff --git a/private/solr-conf/schema_extra_types.xml b/private/solr-conf/schema_extra_types.xml
index 9e56b3cd3..88c29fddd 100644
--- a/private/solr-conf/schema_extra_types.xml
+++ b/private/solr-conf/schema_extra_types.xml
@@ -180,7 +180,7 @@
   <analyzer type="query">
     <charFilter class="solr.MappingCharFilterFactory" mapping="accents_und.txt"/>
     <tokenizer class="solr.StandardTokenizerFactory"/>
-    <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms_und.txt" expand="true" ignoreCase="true"/>
+    <filter class="solr.SynonymGraphFilterFactory" ignoreCase="true" synonyms="synonyms_und.txt" expand="true"/>
     <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_und.txt"/>
     <filter class="solr.WordDelimiterGraphFilterFactory" catenateNumbers="0" generateNumberParts="1" protected="protwords_und.txt" splitOnCaseChange="0" generateWordParts="1" preserveOriginal="1" catenateAll="0" catenateWords="0"/>
     <filter class="solr.LengthFilterFactory" min="2" max="100"/>
diff --git a/private/solr-conf/solrconfig.xml b/private/solr-conf/solrconfig.xml
index b00ce1629..fb05bd8cb 100644
--- a/private/solr-conf/solrconfig.xml
+++ b/private/solr-conf/solrconfig.xml
@@ -11,7 +11,7 @@
      For more details about configurations options that may appear in
      this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
-<config name="drupal-4.3.1-solr-8.x-0" >
+<config name="drupal-4.3.3-solr-8.x-0" >
   <!-- In all configuration below, a prefix of "solr." for class names
        is an alias that causes solr to search appropriate packages,
        including org.apache.solr.(search|update|request|core|analysis)
@@ -75,17 +75,17 @@
        The examples below can be used to load some solr-contribs along
        with their external dependencies.
     -->
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar" />
+  <lib dir="${solr.install.dir:/opt/solr/}/dist/" regex="solr-dataimporthandler-.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
+  <lib dir="${solr.install.dir:/opt/solr/}/contrib/extraction/lib" regex=".*\.jar" />
+  <lib dir="${solr.install.dir:/opt/solr/}/dist/" regex="solr-cell-\d.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
+  <lib dir="${solr.install.dir:/opt/solr/}/contrib/langid/lib/" regex=".*\.jar" />
+  <lib dir="${solr.install.dir:/opt/solr/}/dist/" regex="solr-langid-\d.*\.jar" />
 
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" regex=".*\.jar" />
-  <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-analysis-extras-\d.*\.jar" />
+  <lib dir="${solr.install.dir:/opt/solr/}/contrib/analysis-extras/lib" regex=".*\.jar" />
+  <lib dir="${solr.install.dir:/opt/solr/}/contrib/analysis-extras/lucene-libs" regex=".*\.jar" />
+  <lib dir="${solr.install.dir:/opt/solr/}/dist/" regex="solr-analysis-extras-\d.*\.jar" />
 
   <!-- an exact 'path' can be used instead of a 'dir' to specify a
        specific jar file.  This will cause a serious error to be logged