hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-1617 Switch to SOLRBrowseDAOs implementation as default in DSpace 4.0

Browse Source
This commit is contained in:
Andrea Bollini
2013-08-08 16:42:32 +02:00
parent dcbddcff5a
commit 3b063ca673
3 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dspace-api/src/main/java/org/dspace/browse/BrowseDAOFactory.java
View File

@@ -32,20 +32,8 @@ public class BrowseDAOFactory
String className = ConfigurationManager.getProperty("browseDAO.class");
if (className == null)
{
// For compatibility with previous versions
String db = ConfigurationManager.getProperty("db.name");
if ("postgres".equals(db))
{
return new BrowseDAOPostgres(context);
}
else if ("oracle".equals(db))
{
return new BrowseDAOOracle(context);
}
else
{
throw new BrowseException("The configuration for db.name is either invalid, or contains an unrecognised database");
}
// SOLR implementation is the default since DSpace 4.0
return new SolrBrowseDAO(context);
}
try
{
@@ -73,20 +61,8 @@ public class BrowseDAOFactory
String className = ConfigurationManager.getProperty("browseCreateDAO.class");
if (className == null)
{
// For compatibility with previous versions
String db = ConfigurationManager.getProperty("db.name");
if ("postgres".equals(db))
{
return new BrowseCreateDAOPostgres(context);
}
else if ("oracle".equals(db))
{
return new BrowseCreateDAOOracle(context);
}
else
{
throw new BrowseException("The configuration for db.name is either invalid, or contains an unrecognised database");
}
// SOLR implementation is the default since DSpace 4.0
return new SolrBrowseCreateDAO(context);
}
try
{

10
dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
View File

@@ -680,12 +680,10 @@ public final class BrowseIndex
while ( ((definition = ConfigurationManager.getProperty("webui.browse.index." + idx))) != null)
{
BrowseIndex bi = new BrowseIndex(definition, idx);
//Load the frequency configuration
String freqDefinition = ConfigurationManager.getProperty("webui.browse.metadata.show-freq." + idx);
if (freqDefinition!=null)
bi.displayFrequencies = Boolean.valueOf(freqDefinition);
bi.displayFrequencies = Boolean.valueOf(ConfigurationManager
.getBooleanProperty("webui.browse.metadata.show-freq."
+ idx, true));
browseIndices.add(bi);
idx++;
}

9
dspace/config/dspace.cfg
View File

@@ -639,7 +639,12 @@ 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
#
event.dispatcher.default.consumers = versioning, browse, discovery, 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
event.dispatcher.default.consumers = versioning, discovery, eperson, harvester
# The noindex dispatcher will not create search or browse indexes (useful for batch item imports)
event.dispatcher.noindex.class = org.dspace.event.BasicDispatcher
@@ -878,7 +883,7 @@ webui.strengths.cache = false
#
# Define the DAO class to use this must meet your storage choice for
# the browse system (RDBMS: PostgreSQL or Oracle, SOLR).
# By default the standard RDBMS implementation for your db is used
# By default, since DSpace 4.0, the SOLR implementation is used
#
# PostgreSQL:
# browseDAO.class = org.dspace.browse.BrowseDAOPostgres