From b5c655f3e271dba28d75edb91c8c2ce39a8897e5 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Tue, 26 Jan 2016 11:08:05 -0600 Subject: [PATCH] Remove obsolete DBMS browse configurations (including Spring ones). Update/clarify comments for other browse related configs --- dspace/config/dspace.cfg | 64 ++++---------------------- dspace/config/launcher.xml | 7 --- dspace/config/spring/api/discovery.xml | 5 -- 3 files changed, 10 insertions(+), 66 deletions(-) diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg index 50f76b5b37..5cef36ab25 100644 --- a/dspace/config/dspace.cfg +++ b/dspace/config/dspace.cfg @@ -219,7 +219,8 @@ identifier.doi.namespaceseparator = dspace/ # 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. +# or via Solr's configuration. Some Browse settings are still customizable within +# this configuration file (see "Browse Configuration" section below). # # Discovery configurations may be used to modify which fields in DSpace are # browseable/searchable or appear as filters/facets. These are configured in @@ -924,21 +925,19 @@ webui.preview.brand.fontpoint = 12 ##### Settings for item count (strength) information #### -# whether to display collection and community strengths -# (Since DSpace 4.0, this config option is used by XMLUI, too. +# Whether to display collection and community strengths (i.e. item counts) # XMLUI only makes strengths available to themes if this is set to true! -# To show strengths in the XMLUI, you also need to create a theme which displays them) +# To show strengths in the XMLUI, you also need to create or use a theme which +# displays them. webui.strengths.show = false # if showing strengths, should they be counted in real time or # fetched from cache? # # 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. -# -# The default is to use a cache -# +# index contents every time a page with this feature is requested, +# which may not scale as well as a cached count. +# The default behaviour is to use a cache. # webui.strengths.cache = true @@ -960,8 +959,6 @@ webui.strengths.show = false # # Solr: # browseDAO.class = org.dspace.browse.SolrBrowseDAO -# browseCreateDAO.class = org.dspace.browse.SolrBrowseCreateDAO - # @@ -1063,45 +1060,6 @@ webui.itemlist.sort-option.1 = title:dc.title:title webui.itemlist.sort-option.2 = dateissued:dc.date.issued:date webui.itemlist.sort-option.3 = dateaccessioned:dc.date.accessioned:date -# By default, the display of metadata in the browse indexes is case sensitive -# So, you will get separate entries for the terms -# -# Olive oil -# olive oil -# -# However, clicking through from either of these will result in the same set of items -# (ie. any item that contains either representation in the correct field). -# -# Uncommenting the option below will make the metadata items case-insensitive. This will -# result in a single entry in the example above. However the value displayed may be either 'Olive oil' -# or 'olive oil' - depending on what representation was present in the first item indexed. -# -# If you care about the display of the metadata in the browse index - well, you'll have to go and -# fix the metadata in your items. -# -# webui.browse.metadata.case-insensitive = true - -# Set the options for the size (number of characters) of the fields stored in the database. -# -# The default is 0, which is unlimited size for fields holding indexed data. Some -# database implementations (e.g. Oracle) will enforce their own limit on this field -# size. Reducing the field size will decrease the potential size of your database and -# increase the speed of the browse, but it will also increase the chance of -# mis-ordering of similar fields. Below are commented out, but proposed values for -# reasonably performance versus result quality -# -# Size of field for the browse value (this will affect display, and value sorting) -# -# webui.browse.value_columns.max = 500 - -# Size of field for hidden sort columns (this will affect only sorting, not display) -# -# webui.browse.sort_columns.max = 200 - -# Omission mark to place after truncated strings in display. The default is "..." -# -# webui.browse.value_columns.omission_mark = ... - # Set the options for how the indexes are sorted # # All sorts of normalisations are carried out by the OrderFormatDelegate. @@ -1170,10 +1128,8 @@ webui.browse.link.1 = author:dc.contributor.* # # webui.browse.metadata.show-freq. = true | false # where n is the same index as in webui.browse.index. configurations -# -# For the browse indexes that this property is omitted, it is assumed as true -# please note that only a few overhead is required to compute frequencies when -# DBMS BrowseDAO is used and not overhead at all when SOLRBrowseDAO is used +# Default value is 'true' for all configured metadata fields. +# Examples: # webui.browse.metadata.show-freq.1 = false # webui.browse.metadata.show-freq.2 = false # webui.browse.metadata.show-freq.3 = false diff --git a/dspace/config/launcher.xml b/dspace/config/launcher.xml index 8a60079ab3..970eb480a4 100644 --- a/dspace/config/launcher.xml +++ b/dspace/config/launcher.xml @@ -138,13 +138,6 @@ org.dspace.authority.indexer.AuthorityIndexClient - - index-db-browse - General browse index command (requires extra parameters) - - org.dspace.browse.IndexBrowse - - index-discovery Update Discovery Solr Search Index diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml index c038b156c3..774d1fcf9c 100644 --- a/dspace/config/spring/api/discovery.xml +++ b/dspace/config/spring/api/discovery.xml @@ -26,11 +26,6 @@ - - - -