Entity now freemarker compliant, freemarker lib update, deprecation of HTMLTemplatePr...

[mir.git] / source / mir / storage / Database.java

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 3c75365..f6de097 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -59,25 +59,25 @@ public class Database implements StorageObject {
    *
    * @param   String confFilename Dateiname der Konfigurationsdatei
    */
-  public Database() {
-    //theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Database.Logfile"));
-    theLog = Logfile.getInstance(this.getClass().getName());
-    String database_username=DatabaseConfig.getProp("Database.Username");
-    String database_password=DatabaseConfig.getProp("Database.Password");
-    String database_host=DatabaseConfig.getProp("Database.Host");
-    String theAdaptorName=DatabaseConfig.getProp("Database.Adaptor");
+  public Database() throws StorageObjectException {
+    theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Database.Logfile"));
+    String database_username=MirConfig.getProp("Database.Username");
+    String database_password=MirConfig.getProp("Database.Password");
+    String database_host=MirConfig.getProp("Database.Host");
+    String theAdaptorName=MirConfig.getProp("Database.Adaptor");
     try {
       theEntityClass = Class.forName("mir.entity.GenericEntity");
       theAdaptor = (DatabaseAdaptor)Class.forName(theAdaptorName).newInstance();
-      defaultLimit = Integer.parseInt(DatabaseConfig.getProp("Database.Limit"));
+      defaultLimit = Integer.parseInt(MirConfig.getProp("Database.Limit"));
       database_driver=theAdaptor.getDriver();
       database_url=theAdaptor.getURL(database_username,database_password,database_host);
       theLog.printDebugInfo("adding Broker with: " +database_driver+":"+database_url  );
-      DatabaseConfig.addBroker(database_driver,database_url);
-      myBroker=DatabaseConfig.getBroker();
+      MirConfig.addBroker(database_driver,database_url);
+      myBroker=MirConfig.getBroker();
     }
     catch (Exception e){
       theLog.printError("Bei Konstruktion von Database() with " + theAdaptorName + " -- " +e.toString());
+      throw new StorageObjectException(e.toString());
     }
   }
 
@@ -563,7 +563,6 @@ public class Database implements StorageObject {
     //cache
     invalidatePopupCache();
     try {
-      HashMap theEntityValues = theEntity.getValues();
       ArrayList streamedInput = theEntity.streamedInput();
       StringBuffer f = new StringBuffer();
       StringBuffer v = new StringBuffer();
@@ -583,8 +582,8 @@ public class Database implements StorageObject {
               aValue = "?";
             }
             else {
-              if (theEntityValues.containsKey(aField)) {
-                aValue = "'" + StringUtil.quote((String)theEntityValues.get(aField))
+              if (theEntity.hasValueForField(aField)) {
+                aValue = "'" + StringUtil.quote((String)theEntity.getValue(aField))
                     + "'";
               }
             }
@@ -612,7 +611,7 @@ public class Database implements StorageObject {
       pstmt = con.prepareStatement(sql);
       if (streamedInput != null) {
         for (int i = 0; i < streamedInput.size(); i++) {
-          String inputString = (String)theEntityValues.get(streamedInput.get(i));
+          String inputString = (String)theEntity.getValue((String)streamedInput.get(i));
           pstmt.setBytes(i + 1, inputString.getBytes());
         }
       }
@@ -649,7 +648,6 @@ public class Database implements StorageObject {
     Connection con = null;
     PreparedStatement pstmt = null;
     ArrayList streamedInput = theEntity.streamedInput();
-    HashMap theEntityValues = theEntity.getValues();
     String id = theEntity.getId();
     String aField;
     StringBuffer fv = new StringBuffer();
@@ -662,14 +660,14 @@ public class Database implements StorageObject {
       // only normal cases
       if (!(aField.equals(thePKeyName) || aField.equals("webdb_create") ||
           aField.equals("webdb_lastchange") || (streamedInput != null && streamedInput.contains(aField)))) {
-        if (theEntityValues.containsKey(aField)) {
+        if (theEntity.hasValueForField(aField)) {
           if (firstField == false) {
             fv.append(", ");
           }
           else {
             firstField = false;
           }
-          fv.append(aField).append("='").append(StringUtil.quote((String)theEntityValues.get(aField))).append("'");
+          fv.append(aField).append("='").append(StringUtil.quote((String)theEntity.getValue(aField))).append("'");
         }
       }
     }
@@ -692,7 +690,7 @@ public class Database implements StorageObject {
       pstmt = con.prepareStatement(sql.toString());
       if (streamedInput != null) {
         for (int i = 0; i < streamedInput.size(); i++) {
-          String inputString = (String)theEntityValues.get(streamedInput.get(i));
+          String inputString = theEntity.getValue((String)streamedInput.get(i));
           pstmt.setBytes(i + 1, inputString.getBytes());
         }
       }
@@ -753,7 +751,7 @@ public class Database implements StorageObject {
    * eine SimpleList mit Standard-Popupdaten erzeugt werden koennen soll.
    * @return null
    */
-  public SimpleList getPopupData () {
+  public SimpleList getPopupData () throws StorageObjectException {
     return  null;
   }
 
@@ -763,7 +761,8 @@ public class Database implements StorageObject {
    *  @param hasNullValue  Wenn true wird eine leerer  Eintrag fuer die Popups erzeugt.
    *  @return SimpleList Gibt freemarker.template.SimpleList zurueck.
    */
-  public SimpleList getPopupData (String name, boolean hasNullValue) {
+  public SimpleList getPopupData (String name, boolean hasNullValue) 
+    throws StorageObjectException {
     return  getPopupData(name, hasNullValue, null);
   }
 
@@ -774,8 +773,8 @@ public class Database implements StorageObject {
    *  @param where  Schraenkt die Selektion der Datensaetze ein.
    *  @return SimpleList Gibt freemarker.template.SimpleList zurueck.
    */
-  public SimpleList getPopupData (String name, boolean hasNullValue, String where) {
-    return  getPopupData(name, hasNullValue, where, null);
+  public SimpleList getPopupData (String name, boolean hasNullValue, String where) throws StorageObjectException {
+   return  getPopupData(name, hasNullValue, where, null);
   }
 
   /**
@@ -786,8 +785,7 @@ public class Database implements StorageObject {
    *  @param order  Gibt ein Feld als Sortierkriterium an.
    *  @return SimpleList Gibt freemarker.template.SimpleList zurueck.
    */
-  public SimpleList getPopupData (String name, boolean hasNullValue, String where,
-      String order) {
+  public SimpleList getPopupData (String name, boolean hasNullValue, String where, String order) throws StorageObjectException {
     // caching
     if (hasPopupCache && popupCache != null)
       return  popupCache;
@@ -829,6 +827,7 @@ public class Database implements StorageObject {
       }
     } catch (Exception e) {
       theLog.printDebugInfo(e.toString());
+      throw new StorageObjectException(e.toString());
     } finally {
       freeConnection(con, stmt);
     }
@@ -968,7 +967,10 @@ public class Database implements StorageObject {
       pstmt = con.prepareStatement(sql);
       result = pstmt.executeUpdate();
     }
-    catch (Exception e) {theLog.printDebugInfo("settimage :: setImage gescheitert: "+e.toString());}
+    catch (Exception e) {
+      theLog.printDebugInfo("settimage :: setImage gescheitert: "+e.toString());
+      throw new StorageObjectException("executeUpdate failed: "+e.toString());
+    }
     finally { freeConnection(con,pstmt); }
     theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms. for: " + sql);
     return result;
@@ -1032,11 +1034,11 @@ public class Database implements StorageObject {
   /**
    * Datenbankverbindung wird geschlossen
    */
-  public void disconnectPool () {
+  public void disconnectPool () throws StorageObjectException {
     try {
       myBroker.destroy(100);
     } catch (SQLException sqe) {
-      ;
+      throwSQLException(sqe, "disconnectPool");
     }
   }
 
@@ -1060,17 +1062,21 @@ public class Database implements StorageObject {
    * @param con Connection zur Datenbank
    * @param stmt Statement-Objekt
    */
-  public void freeConnection (Connection con, Statement stmt) {
+  public void freeConnection (Connection con, Statement stmt)
+    throws StorageObjectException {
     try {
       if (stmt != null)
         stmt.close();
     } catch (SQLException e1) {
       theLog.printDebugInfo(e1.toString());
+      throw new StorageObjectException("DB, in freeConnection: "+e1.toString());
     }
     if (con != null)
       myBroker.freeConnection(con);
-    else
+    else {
       theLog.printDebugInfo("Con was null!");
+      throw new StorageObjectException("Con was null!");
+    }
   }
 
   /**
@@ -1094,14 +1100,24 @@ public class Database implements StorageObject {
         sqe.toString());
   }
 
+  protected void _throwStorageObjectException (Exception e, String wo) throws StorageObjectException {
+    if (e != null) {
+        theLog.printError(e.toString()+ wo);
+        throw  new StorageObjectException(wo + e.toString());
+    } else {
+        theLog.printError(wo);
+        throw  new StorageObjectException(wo);
+    }
+        
+  }
+
   /**
    * Loggt Fehlermeldung mit dem Parameter Message und wirft dannach eine StorageObjectException
    * @param message Nachricht mit dem Fehler
    * @exception StorageObjectException
    */
   void throwStorageObjectException (String message) throws StorageObjectException {
-    theLog.printError(message);
-    throw  new StorageObjectException(message);
+    _throwStorageObjectException(null, message);
   }
 }