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

Merge pull request #7 from robintaylor/master

Browse Source 
[DS-1156] Refactor Browse related code out of InitializeDatabase into InitializeBrowseDatabase
This commit is contained in:
Robin Taylor
2012-05-03 01:19:24 -07:00
parent 14f9066b71 3d4f40f4dc
commit 67558c447a
3 changed files with 92 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
dspace-api/src/main/java/org/dspace/browse/InitializeBrowseDatabase.java Normal file
View File

@@ -0,0 +1,80 @@
/**
* The contents of this file are subject to the license and copyright
* detailed in the LICENSE and NOTICE files at the root of the source
* tree and available online at
*
* http://www.dspace.org/license/
*/
package org.dspace.browse;
import org.apache.log4j.Logger;
import org.dspace.core.ConfigurationManager;
/**
* Command-line executed class for initializing the Browse tables of the DSpace database.
*
* @author Robert Tansley
* @version $Revision$
*/
public class InitializeBrowseDatabase
{
/** log4j category */
private static Logger log = Logger.getLogger(InitializeBrowseDatabase.class);
public static void main(String[] argv)
{
// Usage checks
if (argv.length != 1)
{
log.warn("Schema file not specified");
System.exit(1);
}
ConfigurationManager.loadConfig(null);
log.info("Initializing Browse Database");
try
{
if("clean-database.sql".equals(argv[0]))
{
try
{
IndexBrowse browse = new IndexBrowse();
browse.setDelete(true);
browse.setExecute(true);
browse.clearDatabase();
}
catch (BrowseException e)
{
log.error(e.getMessage(),e);
throw new IllegalStateException(e.getMessage(),e);
}
}
else
{
try
{
IndexBrowse browse = new IndexBrowse();
browse.setRebuild(true);
browse.setExecute(true);
browse.initBrowse();
}
catch (BrowseException e)
{
log.error(e.getMessage(),e);
throw new IllegalStateException(e.getMessage(),e);
}
}
System.exit(0);
}
catch (Exception e)
{
log.fatal("Caught exception:", e);
System.exit(1);
}
}
}

34
dspace-api/src/main/java/org/dspace/storage/rdbms/InitializeDatabase.java
View File

@@ -13,8 +13,6 @@ import java.io.FileReader;
import java.io.IOException;
import org.apache.log4j.Logger;
import org.dspace.browse.BrowseException;
import org.dspace.browse.IndexBrowse;
import org.dspace.core.ConfigurationManager;
/**
@@ -46,39 +44,11 @@ public class InitializeDatabase
{
if("clean-database.sql".equals(argv[0]))
{
try
{
IndexBrowse browse = new IndexBrowse();
browse.setDelete(true);
browse.setExecute(true);
browse.clearDatabase();
}
catch (BrowseException e)
{
log.error(e.getMessage(),e);
throw new IllegalStateException(e.getMessage(),e);
}
DatabaseManager.loadSql(getScript(argv[0]));
DatabaseManager.loadSql(getScript(argv[0]));
}
else
{
DatabaseManager.loadSql(getScript(argv[0]));
try
{
IndexBrowse browse = new IndexBrowse();
browse.setRebuild(true);
browse.setExecute(true);
browse.initBrowse();
}
catch (BrowseException e)
{
log.error(e.getMessage(),e);
throw new IllegalStateException(e.getMessage(),e);
}
DatabaseManager.loadSql(getScript(argv[0]));
}
System.exit(0);