solr_conf/conf/solrconfig.xml in blacklight-access_controls-6.0.0 vs solr_conf/conf/solrconfig.xml in blacklight-access_controls-6.0.1

- old
+ new

@@ -1,88 +1,29 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - This is a stripped down config file used for a simple example... - It is *not* a good example to work from. ---> <config> - - <!-- Controls what version of Lucene various components of Solr - adhere to. Generally, you want to use the latest version to - get all bug fixes and improvements. It is highly recommended - that you fully re-index after changing this setting as it can - affect both how text is indexed and queried. - --> - <luceneMatchVersion>5.0.0</luceneMatchVersion> - - <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" /> - <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" /> - <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" /> - <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" /> + <!-- NOTE: various comments and unused configuration possibilities have been purged + from this file. Please refer to http://wiki.apache.org/solr/SolrConfigXml, + as well as the default solrconfig file included with Solr --> - <directoryFactory name="DirectoryFactory" - class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"> - </directoryFactory> + <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError> - <codecFactory class="solr.SchemaCodecFactory"/> + <luceneMatchVersion>6.1.0</luceneMatchVersion> - <schemaFactory class="ClassicIndexSchemaFactory"/> + <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/> - - <dataDir>${solr.blacklight-core.data.dir:}</dataDir> - - <requestDispatcher handleSelect="true" > - <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048000" /> - </requestDispatcher> - - <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" /> - - <!-- config for the admin interface --> - <admin> - <defaultQuery>*:*</defaultQuery> - </admin> - <updateHandler class="solr.DirectUpdateHandler2"> <updateLog> - <str name="dir">${solr.ulog.dir:}</str> + <str name="dir">${solr.core0.data.dir:}</str> </updateLog> - - <autoCommit> - <maxTime>${solr.autoCommit.maxTime:15000}</maxTime> - <openSearcher>false</openSearcher> - </autoCommit> - - <autoSoftCommit> - <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime> - </autoSoftCommit> </updateHandler> - <!-- SearchHandler + <!-- solr lib dirs --> + <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" /> + <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" /> - http://wiki.apache.org/solr/SearchHandler + <dataDir>${solr.data.dir:}</dataDir> - For processing Search Queries, the primary Request Handler - provided with Solr is "SearchHandler" It delegates to a sequent - of SearchComponents (see below) and supports distributed - queries across multiple shards - --> <requestHandler name="search" class="solr.SearchHandler" default="true"> <!-- default values for query parameters can be specified, these will be overridden by parameters in the request --> <lst name="defaults"> @@ -100,31 +41,38 @@ those searches. You may also be interested in: http://wiki.apache.org/solr/LocalParams --> <str name="qf"> id + full_title_tsim + short_title_tsim + alternative_title_tsim active_fedora_model_ssi - title_tesim - author_tesim - subject_tesim + title_tsim + author_tsimesim + subject_tsim + all_text_timv </str> <str name="pf"> all_text_timv^10 </str> <str name="author_qf"> - author_tesim + author_tsim </str> <str name="author_pf"> </str> <str name="title_qf"> - title_tesim + title_tsim + full_title_tsim + short_title_tsim + alternative_title_tsim </str> <str name="title_pf"> </str> <str name="subject_qf"> - subject_tesim + subject_tsim </str> <str name="subject_pf"> </str> <str name="fl"> @@ -132,10 +80,13 @@ score </str> <str name="facet">true</str> <str name="facet.mincount">1</str> + <str name="facet.limit">10</str> + <str name="facet.field">active_fedora_model_ssi</str> + <str name="facet.field">subject_ssim</str> <str name="spellcheck">true</str> <str name="spellcheck.dictionary">default</str> <str name="spellcheck.onlyMorePopular">true</str> <str name="spellcheck.extendedResults">true</str> @@ -165,10 +116,11 @@ embargo_release_date_dtsi inheritable_access_ssim, inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim, inheritable_read_access_group_ssim,inheritable_read_access_person_ssim, inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim, + inheritable_download_access_group_ssim,inheritable_download_access_person_ssim, inheritable_embargo_release_date_dtsi </str> </lst> </requestHandler> @@ -177,38 +129,16 @@ <str name="echoParams">explicit</str> <str name="defType">lucene</str> </lst> </requestHandler> - <!-- for requests to get a single document; use id=666 instead of q=id:666 --> - <requestHandler name="document" class="solr.SearchHandler" > - <lst name="defaults"> - <str name="echoParams">all</str> - <str name="fl">*</str> - <str name="rows">1</str> - <str name="q">{!term f=id v=$id}</str> <!-- use id=666 instead of q=id:666 --> - </lst> - </requestHandler> -<!-- Spell Check - - The spell check component can return a list of alternative spelling - suggestions. - - http://wiki.apache.org/solr/SpellCheckComponent - --> <searchComponent name="spellcheck" class="solr.SpellCheckComponent"> - <str name="queryAnalyzerFieldType">textSpell</str> - - <!-- Multiple "Spell Checkers" can be declared and used by this - component + <!-- Multiple "Spell Checkers" can be declared and used by this component + (e.g. for title_spell field) --> - - <!-- a spellchecker built from a field of the main index, and - written to disk - --> <lst name="spellchecker"> <str name="name">default</str> <str name="field">spell</str> <str name="spellcheckIndexDir">./spell</str> <str name="buildOnOptimize">true</str> @@ -232,49 +162,10 @@ <str name="field">title_spell</str> <str name="spellcheckIndexDir">./spell_title</str> <str name="accuracy">0.7</str> <str name="buildOnOptimize">true</str> </lst> - - <!-- a spellchecker that uses a different distance measure --> - <!-- - <lst name="spellchecker"> - <str name="name">jarowinkler</str> - <str name="field">spell</str> - <str name="distanceMeasure"> - org.apache.lucene.search.spell.JaroWinklerDistance - </str> - <str name="spellcheckIndexDir">spellcheckerJaro</str> - </lst> - --> - - <!-- a spellchecker that use an alternate comparator - - comparatorClass be one of: - 1. score (default) - 2. freq (Frequency first, then score) - 3. A fully qualified class name - --> - <!-- - <lst name="spellchecker"> - <str name="name">freq</str> - <str name="field">lowerfilt</str> - <str name="spellcheckIndexDir">spellcheckerFreq</str> - <str name="comparatorClass">freq</str> - <str name="buildOnCommit">true</str> - --> - - <!-- A spellchecker that reads the list of words from a file --> - <!-- - <lst name="spellchecker"> - <str name="classname">solr.FileBasedSpellChecker</str> - <str name="name">file</str> - <str name="sourceLocation">spellings.txt</str> - <str name="characterEncoding">UTF-8</str> - <str name="spellcheckIndexDir">spellcheckerFile</str> - </lst> - --> </searchComponent> <searchComponent name="suggest" class="solr.SuggestComponent"> <lst name="suggester"> <str name="name">mySuggester</str> @@ -294,20 +185,13 @@ <arr name="components"> <str>suggest</str> </arr> </requestHandler> - <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler"> - <lst name="defaults"> - <str name="fmap.Last-Modified">last_modified</str> - <str name="uprefix">ignored_</str> - </lst> - <!--Optional. Specify a path to a tika configuration file. See the Tika docs for details.--> - <!-- <str name="tika.config">/my/path/to/tika.config</str> --> - <!-- Optional. Specify one or more date formats to parse. See DateUtil.DEFAULT_DATE_FORMATS - for default date formats --> - <!-- <lst name="date.formats"> --> - <!-- <str>yyyy&#45;MM&#45;dd</str> --> - <!-- </lst> --> - </requestHandler> -</config> + <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> + <requestDispatcher handleSelect="true" > + <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" /> + </requestDispatcher> + + <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" /> +</config>