1.1 --- a/org/sonews/storage/impl/JDBCDatabase.java	Fri Dec 25 15:42:46 2009 +0100
     1.2 +++ b/org/sonews/storage/impl/JDBCDatabase.java	Sun May 09 12:38:46 2010 +0200
     1.3 @@ -52,7 +52,7 @@
     1.4  public class JDBCDatabase implements Storage
     1.5  {
     1.6  
     1.7 -  public static final int MAX_RESTARTS = 3;
     1.8 +  public static final int MAX_RESTARTS = 2;
     1.9    
    1.10    private Connection        conn = null;
    1.11    private PreparedStatement pstmtAddArticle1 = null;
    1.12 @@ -110,13 +110,13 @@
    1.13      {
    1.14        // Load database driver
    1.15        Class.forName(
    1.16 -              Config.inst().get(Config.STORAGE_DBMSDRIVER, "java.lang.Object"));
    1.17 +        Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_DBMSDRIVER, "java.lang.Object"));
    1.18  
    1.19        // Establish database connection
    1.20        this.conn = DriverManager.getConnection(
    1.21 -              Config.inst().get(Config.STORAGE_DATABASE, "<not specified>"),
    1.22 -              Config.inst().get(Config.STORAGE_USER, "root"),
    1.23 -              Config.inst().get(Config.STORAGE_PASSWORD, ""));
    1.24 +        Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_DATABASE, "<not specified>"),
    1.25 +        Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_USER, "root"),
    1.26 +        Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_PASSWORD, ""));
    1.27  
    1.28        this.conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
    1.29        if(this.conn.getTransactionIsolation() != Connection.TRANSACTION_SERIALIZABLE)