Skip to content

Commit

Permalink
PE-601 Update Solr schema (#578)
Browse files Browse the repository at this point in the history
  • Loading branch information
RichardDavies authored Apr 26, 2024
1 parent 3ece760 commit f27ec93
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion private/solr-conf/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion private/solr-conf/schema_extra_types.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
18 changes: 9 additions & 9 deletions private/solr-conf/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f27ec93

Please sign in to comment.