Skip to content

Commit

Permalink
Remove all major Lucene configurations.
Browse files Browse the repository at this point in the history
  • Loading branch information
tdonohue committed Jan 5, 2016
1 parent 6f2a515 commit 35e2242
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 129 deletions.
114 changes: 19 additions & 95 deletions dspace/config/dspace.cfg
Expand Up @@ -224,65 +224,20 @@ identifier.doi.namespaceseparator = dspace/

##### Search settings #####

# Where to put search index files
search.dir = ${dspace.dir}/search

# Higher values of search.max-clauses will enable prefix searches to work on
# large repositories
search.max-clauses = 2048

# Which Lucene Analyzer implementation to use. If this is omitted or
# commented out, the standard DSpace analyzer (designed for English)
# is used by default.

# Non-Stemming analyzer. Does not "stem" words/terms. When using this analyzer,
# a search for "wellness" will always return items matching "wellness" and not "well".
# However, similarly a search for "experiments" will only return objects matching
# "experiments" and not "experiment" or "experimenting".
# search.analyzer = org.dspace.search.DSNonStemmingAnalyzer

# Chinese analyzer
# search.analyzer = org.apache.lucene.analysis.cn.ChineseAnalyzer

search.analyzer = org.dspace.search.DSAnalyzer

# Boolean search operator to use, current supported values are OR and AND
# If this config item is missing or commented out, OR is used
# AND requires all search terms to be present
# OR requires one or more search terms to be present
search.operator = OR

# Maximum number of terms indexed for a single field in Lucene.
# Default is 10,000 words - often not enough for full-text indexing.
# If you change this, you'll need to re-index for the change
# to take effect on previously added items.
# -1 = unlimited (Integer.MAX_VALUE)
search.maxfieldlength = 10000

##### Fields to Index for Search #####

# DC metadata elements.qualifiers to be indexed for search
# format: - search.index.[number] = [search field]:element.qualifier
# - * used as wildcard
# - inputform -> In case we have different input-forms for different repository supported locales (e.g input-forms_el.xml, input-forms_pt.xml etc). In this case, the
# stored and the displayed value from all input-forms are indexed. If the stored value is not found in input-forms, it is indexed anyway.
# e.g.:search.index.12 = language:dc.language:inputform
#
### changing these will change your search results, ###
### but will NOT automatically change your search displays ###

search.index.1 = author:dc.contributor.*
search.index.2 = author:dc.creator.*
search.index.3 = title:dc.title.*
search.index.4 = keyword:dc.subject.*
search.index.5 = abstract:dc.description.abstract
search.index.6 = author:dc.description.statementofresponsibility
search.index.7 = series:dc.relation.ispartofseries
search.index.8 = abstract:dc.description.tableofcontents
search.index.9 = mime:dc.format.mimetype
search.index.10 = sponsor:dc.description.sponsorship
search.index.11 = identifier:dc.identifier.*
search.index.12 = language:dc.language.iso
# DSpace search/browse is now driven by Discovery (Solr backend).
# Therefore, search settings are configurable either via Discovery's configurations
# or via Solr's configuration.
#
# Discovery configurations may be used to modify which fields in DSpace are
# browseable/searchable or appear as filters/facets. These are configured in
# the discovery.xml at:
# [dspace]/config/spring/api/discovery.xml
#
# See also the Discovery Documentation:
# https://wiki.duraspace.org/display/DSDOC6x/Discovery
#
# Underlying Apache Solr configurations may also be tweaked at:
# [dspace]/solr/search/conf/

##### Handle settings ######

Expand Down Expand Up @@ -697,15 +652,6 @@ aip.disseminate.dmd = MODS, DIM
# default synchronous dispatcher (same behavior as traditional DSpace)
event.dispatcher.default.class = org.dspace.event.BasicDispatcher

#
# uncomment below and comment out original property to enable the legacy lucene indexing
# event.dispatcher.default.consumers = versioning, search, browse, eperson, harvester
#
# add the browse consumer if you want to switch back to the DBMS Browse DAOs implementation
# as the SOLR implementation rely on the discovery consumer
#
# event.dispatcher.default.consumers = versioning, browse, discovery, eperson, harvester
#
# Add doi here if you are using org.dspace.identifier.DOIIdentifierProvider to generate DOIs.
# Adding doi here makes DSpace send metadata updates to your doi registration agency.
# Add rdf here, if you are using dspace-rdf to export your repository content as RDF.
Expand All @@ -715,18 +661,10 @@ event.dispatcher.default.consumers = versioning, discovery, eperson, harvester
event.dispatcher.noindex.class = org.dspace.event.BasicDispatcher
event.dispatcher.noindex.consumers = eperson

# consumer to maintain the search index
event.consumer.search.class = org.dspace.search.SearchConsumer
event.consumer.search.filters = Community|Collection|Item|Bundle+Add|Create|Modify|Modify_Metadata|Delete|Remove

# consumer to maintain the discovery index
event.consumer.discovery.class = org.dspace.discovery.IndexEventConsumer
event.consumer.discovery.filters = Community|Collection|Item|Bundle+Add|Create|Modify|Modify_Metadata|Delete|Remove

# consumer to maintain the browse index
event.consumer.browse.class = org.dspace.browse.BrowseConsumer
event.consumer.browse.filters = Community|Collection|Item|Bundle+Add|Create|Modify|Modify_Metadata|Delete|Remove

# consumer related to EPerson changes
event.consumer.eperson.class = org.dspace.eperson.EPersonConsumer
event.consumer.eperson.filters = EPerson+Create
Expand Down Expand Up @@ -1010,8 +948,7 @@ webui.strengths.show = false
#
# Counts fetched in real time will perform an actual count of the
# database contents every time a page with this feature is requested,
# which will not scale. The default behaviour is to use a cache (see
# ItemCounter configuration)
# which will not scale. The default behaviour is to use a cache.
#
# The default is to use a cache
#
Expand All @@ -1021,21 +958,8 @@ webui.strengths.show = false
###### ItemCounter Configuration ######
#
# Define the DAO class to use. This must correspond to your choice of
# storage for the browse system (RDBMS: PostgreSQL or Oracle, Solr).
# By default, since DSpace 4.0, the Solr implementation is used.
#
# Only if you use a DBMS implementation and want to use the cache
# (recommended!), you must run the following command periodically
# to update the count:
#
# [dspace]/bin/itemcounter (NOT required if you use the Solr implementation)
#
#
# PostgreSQL:
# ItemCountDAO.class = org.dspace.browse.ItemCountDAOPostgres
#
# Oracle:
# ItemCountDAO.class = org.dspace.browse.ItemCountDAOOracle
# storage for the browse system (Solr is only option at this time).
# By default, the Solr implementation is used.
#
# Solr:
# ItemCountDAO.class = org.dspace.browse.ItemCountDAOSolr
Expand All @@ -1044,8 +968,8 @@ webui.strengths.show = false
###### Browse Configuration ######
#
# Define the DAO class to use this must meet your storage choice for
# the browse system (Solr).
# By default, since DSpace 4.0, the Solr implementation is used
# the browse system (Solr is only option at this time).
# By default, the Solr implementation is used
#
# Solr:
# browseDAO.class = org.dspace.browse.SolrBrowseDAO
Expand Down
7 changes: 0 additions & 7 deletions dspace/config/launcher.xml
Expand Up @@ -138,13 +138,6 @@
<class>org.dspace.discovery.IndexClient</class>
</step>
</command>
<command>
<name>itemcounter</name>
<description>Update the item strength counts in the user interface</description>
<step passuserargs="false">
<class>org.dspace.browse.ItemCounter</class>
</step>
</command>
<command>
<name>itemupdate</name>
<description>Item update tool for altering metadata and bitstream content in items</description>
Expand Down
25 changes: 0 additions & 25 deletions dspace/config/xmlui.xconf
Expand Up @@ -59,12 +59,6 @@
/xmlui/cocoon/aspects/ directory followed by a slash.
-->
<aspects>
<!--
@deprecated: the Artifact Browser has been divided into ViewArtifacts,
BrowseArtifacts, SearchArtifacts
<aspect name="Artifact Browser" path="resource://aspects/ArtifactBrowser/" />
-->

<!-- =====================
Item Level Versioning
===================== -->
Expand Down Expand Up @@ -115,25 +109,6 @@
database migration scripts as detailed in the DSpace Documentation -->
<!-- <aspect name="XMLWorkflow" path="resource://aspects/XMLWorkflow/" /> -->

<!-- ==============
Search Engines
============== -->
<!--
To enable the old lucene based search (no facets, filters), uncomment this aspect.
Also make sure to comment out the above 'Discovery' aspect
(in the "Basic Features/Aspects" group) as leaving it on together
with Searching Artifacts aspect will cause UI overlap issues
@deprecated Since DSpace 4 the system use an abstraction layer named
Discovery to provide access to different search providers. The
legacy system built upon Apache Lucene is likely to be removed in
a future version. If you are interested in using Lucene as backend
for the DSpace search system, please consider to build a Lucene
implementation of the Discovery interfaces
-->
<!--<aspect name="Searching Artifacts" path="resource://aspects/SearchArtifacts/" />-->


<!-- ==============
SWORDv1 Client
============== -->
Expand Down
2 changes: 0 additions & 2 deletions dspace/src/main/config/build.xml
Expand Up @@ -743,8 +743,6 @@ Common usage:

<mkdir dir="${handle.dir}" />

<mkdir dir="${search.dir}" />

<mkdir dir="${log.dir}" />

<mkdir dir="${upload.temp.dir}" />
Expand Down

0 comments on commit 35e2242

Please sign in to comment.