solr_conf/conf/solrconfig.xml in blacklight-access_controls-0.3.0 vs solr_conf/conf/solrconfig.xml in blacklight-access_controls-0.4.0

- old
+ new

@@ -15,56 +15,65 @@ 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. + 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" /> - <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar"/> - - <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib"/> - <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs"/> - - <directoryFactory name="DirectoryFactory" + <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"> - </directoryFactory> + </directoryFactory> <codecFactory class="solr.SchemaCodecFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/> <dataDir>${solr.blacklight-core.data.dir:}</dataDir> - + <requestDispatcher handleSelect="true" > - <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" /> + <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048000" /> </requestDispatcher> - + <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" /> - <!-- config for the admin interface --> + <!-- config for the admin interface --> <admin> <defaultQuery>*:*</defaultQuery> </admin> - <requestHandler name="/dataimport" class="solr.DataImportHandler"> - <lst name="defaults"> - <str name="config">db-data-config.xml</str> - </lst> - </requestHandler> + <updateHandler class="solr.DirectUpdateHandler2"> + <updateLog> + <str name="dir">${solr.ulog.dir:}</str> + </updateLog> + <autoCommit> + <maxTime>${solr.autoCommit.maxTime:15000}</maxTime> + <openSearcher>false</openSearcher> + </autoCommit> + + <autoSoftCommit> + <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime> + </autoSoftCommit> + </updateHandler> + <!-- SearchHandler http://wiki.apache.org/solr/SearchHandler For processing Search Queries, the primary Request Handler @@ -74,140 +83,121 @@ --> <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"> - <str name="defType">edismax</str> - <str name="echoParams">explicit</str> - <int name="rows">10</int> + <lst name="defaults"> + <str name="defType">edismax</str> + <str name="echoParams">explicit</str> + <str name="q.alt">*:*</str> + <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str> + <int name="qs">1</int> + <int name="ps">2</int> + <float name="tie">0.01</float> + <!-- this qf and pf are used by default, if not otherwise specified by + client. The default blacklight_config will use these for the + "keywords" search. See the author_qf/author_pf, title_qf, etc + below, which the default blacklight_config will specify for + those searches. You may also be interested in: + http://wiki.apache.org/solr/LocalParams + --> + <str name="qf"> + id + active_fedora_model_ssi + title_tesim + author_tesim + subject_tesim + </str> + <str name="pf"> + all_text_timv^10 + </str> - <str name="q.alt">*:*</str> - <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str> + <str name="author_qf"> + author_tesim + </str> + <str name="author_pf"> + </str> + <str name="title_qf"> + title_tesim + </str> + <str name="title_pf"> + </str> + <str name="subject_qf"> + subject_tesim + </str> + <str name="subject_pf"> + </str> - <!-- this qf and pf are used by default, if not otherwise specified by - client. The default blacklight_config will use these for the - "keywords" search. See the author_qf/author_pf, title_qf, etc - below, which the default blacklight_config will specify for - those searches. You may also be interested in: - http://wiki.apache.org/solr/LocalParams - --> + <str name="fl"> + *, + score + </str> - <str name="qf"> - title_ssi^25000 - abstract_tesi^1000 - text - </str> + <str name="facet">true</str> + <str name="facet.mincount">1</str> - <int name="ps">3</int> - <float name="tie">0.01</float> + <str name="spellcheck">true</str> + <str name="spellcheck.dictionary">default</str> + <str name="spellcheck.onlyMorePopular">true</str> + <str name="spellcheck.extendedResults">true</str> + <str name="spellcheck.collate">false</str> + <str name="spellcheck.count">5</str> - <!-- NOT using marc_display because it is large and will slow things down for search results --> - <str name="fl"> - *, - score - </str> - <!--str name="fl"> - id, - score, - title_tsi, - access_level_ss, - abstract_tesi - </str--> - - <str name="facet">true</str> - <str name="facet.mincount">1</str> - <str name="facet.limit">10</str> - <str name="facet.field">year_isi</str> - <str name="facet.field">degree_name_ssi</str> - <str name="facet.field">semester_ssi</str> - <str name="facet.field">program_name_ssi</str> - - <str name="spellcheck">true</str> - <str name="spellcheck.dictionary">default</str> - <str name="spellcheck.onlyMorePopular">true</str> - <str name="spellcheck.extendedResults">true</str> - <str name="spellcheck.collate">false</str> - <str name="spellcheck.count">5</str> - - </lst> - <!-- In addition to defaults, "appends" params can be specified - to identify values which should be appended to the list of - multi-val params from the query (or the existing "defaults"). - --> - <!-- In this example, the param "fq=instock:true" would be appended to - any query time fq params the user may specify, as a mechanism for - partitioning the index, independent of any user selected filtering - that may also be desired (perhaps as a result of faceted searching). - that may also be desired (perhaps as a result of faceted searching). - - NOTE: there is *absolutely* nothing a client can do to prevent these - "appends" values from being used, so don't use this mechanism - unless you are sure you always want it. - --> - <!-- - <lst name="appends"> - <str name="fq">inStock:true</str> - </lst> - --> - <!-- "invariants" are a way of letting the Solr maintainer lock down - the options available to Solr clients. Any params values - specified here are used regardless of what values may be specified - in either the query, the "defaults", or the "appends" params. - - In this example, the facet.field and facet.query params would - be fixed, limiting the facets clients can use. Faceting is - not turned on by default - but if the client does specify - facet=true in the request, these are the only facets they - will be able to see counts for; regardless of what other - facet.field or facet.query params they may specify. - - NOTE: there is *absolutely* nothing a client can do to prevent these - "invariants" values from being used, so don't use this mechanism - unless you are sure you always want it. - --> - <!-- - <lst name="invariants"> - <str name="facet.field">cat</str> - <str name="facet.field">manu_exact</str> - <str name="facet.query">price:[* TO 500]</str> - <str name="facet.query">price:[500 TO *]</str> - </lst> - --> - <!-- If the default list of SearchComponents is not desired, that - list can either be overridden completely, or components can be - prepended or appended to the default list. (see below) - --> - <!-- - <arr name="components"> - <str>nameOfCustomComponent1</str> - <str>nameOfCustomComponent2</str> - </arr> - --> + </lst> <arr name="last-components"> <str>spellcheck</str> </arr> + </requestHandler> + <requestHandler name="permissions" class="solr.SearchHandler" > + <lst name="defaults"> + <str name="facet">off</str> + <str name="echoParams">all</str> + <str name="rows">1</str> + <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 --> + <str name="fl"> + id, + access_ssim, + discover_access_group_ssim,discover_access_person_ssim, + read_access_group_ssim,read_access_person_ssim, + edit_access_group_ssim,edit_access_person_ssim, + download_access_group_ssim,download_access_person_ssim, + depositor_ti, + 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_embargo_release_date_dtsi + </str> + </lst> </requestHandler> + <requestHandler name="standard" class="solr.SearchHandler"> + <lst name="defaults"> + <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 +<!-- Spell Check - The spell check component can return a list of alternative spelling - suggestions. + The spell check component can return a list of alternative spelling + suggestions. - http://wiki.apache.org/solr/SpellCheckComponent - --> + 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 @@ -255,11 +245,11 @@ </str> <str name="spellcheckIndexDir">spellcheckerJaro</str> </lst> --> - <!-- a spellchecker that use an alternate comparator + <!-- 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 @@ -304,27 +294,20 @@ <arr name="components"> <str>suggest</str> </arr> </requestHandler> - <requestHandler name="permissions" class="solr.SearchHandler" > + <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler"> <lst name="defaults"> - <str name="facet">off</str> - <str name="echoParams">all</str> - <str name="rows">1</str> - <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 --> - <str name="fl"> - id, - access_ssim, - discover_access_group_ssim,discover_access_person_ssim, - read_access_group_ssim,read_access_person_ssim, - download_access_group_ssim,download_access_person_ssim, - depositor_ti, - inheritable_access_ssim, - inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim, - inheritable_read_access_group_ssim,inheritable_read_access_person_ssim, - inheritable_download_access_group_ssim,inheritable_download_access_person_ssim, - </str> + <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> +