quiet some unnecessary logging and remove some unused stuff

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

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 828357c..20bd66d 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -56,7 +56,7 @@ import  mir.util.*;
  * Treiber, Host, User und Passwort, ueber den der Zugriff auf die\r
  * Datenbank erfolgt.\r
  *\r
- * @version $Id: Database.java,v 1.28 2002/12/17 19:20:31 zapata Exp $\r
+ * @version $Id: Database.java,v 1.29 2002/12/23 03:18:02 mh Exp $\r
  * @author rk\r
  *\r
  */\r
@@ -130,18 +130,6 @@ public class Database implements StorageObject {
       throw new StorageObjectException("Error in Database() constructor with "\r
                                        +e.getMessage());\r
     }\r
-              /*String database_username=MirConfig.getProp("Database.Username");\r
-              String database_password=MirConfig.getProp("Database.Password");\r
-              String database_host=MirConfig.getProp("Database.Host");\r
-              try {\r
-                      database_driver=theAdaptor.getDriver();\r
-                      database_url=theAdaptor.getURL(database_username,database_password,\r
-                                                                                                                                              database_host);\r
-                      theLog.printDebugInfo("adding Broker with: " +database_driver+":"+\r
-                                                                                                              database_url  );\r
-                      MirConfig.addBroker(database_driver,database_url);\r
-    //myBroker=MirConfig.getBroker();\r
-              }*/\r
   }\r
 \r
   /**\r
@@ -283,13 +271,9 @@ public class Database implements StorageObject {
             break;\r
           case java.sql.Types.CHAR:case java.sql.Types.VARCHAR:case java.sql.Types.LONGVARCHAR:\r
             outValue = rs.getString(valueIndex);\r
-            //if (outValue != null)\r
-            //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));\r
             break;\r
           case java.sql.Types.LONGVARBINARY:\r
             outValue = rs.getString(valueIndex);\r
-            //if (outValue != null)\r
-            //outValue = StringUtil.encodeHtml(StringUtil.unquote(outValue));\r
             break;\r
           case java.sql.Types.TIMESTAMP:\r
             // it's important to use Timestamp here as getting it\r
@@ -742,7 +726,7 @@ public class Database implements StorageObject {
       // insert into db\r
       StringBuffer sqlBuf = new StringBuffer("insert into ").append(theTable).append("(").append(f).append(") values (").append(v).append(")");\r
       String sql = sqlBuf.toString();\r
-      theLog.printInfo("INSERT: " + sql);\r
+      //theLog.printInfo("INSERT: " + sql);\r
       con = getPooledCon();\r
       con.setAutoCommit(false);\r
       pstmt = con.prepareStatement(sql);\r
@@ -861,7 +845,7 @@ public class Database implements StorageObject {
       }\r
     }\r
     sql.append(" where id=").append(id);\r
-    theLog.printInfo("UPDATE: " + sql);\r
+    //theLog.printInfo("UPDATE: " + sql);\r
     // execute sql\r
     try {\r
       con = getPooledCon();\r
@@ -911,7 +895,7 @@ public class Database implements StorageObject {
     Statement stmt = null; Connection con = null;\r
     int res = 0;\r
     String sql="delete from "+theTable+" where "+thePKeyName+"='"+id+"'";\r
-    theLog.printInfo("DELETE " + sql);\r
+    //theLog.printInfo("DELETE " + sql);\r
     try {\r
       con = getPooledCon(); stmt = con.createStatement();\r
       res = stmt.executeUpdate(sql);\r
@@ -1069,13 +1053,11 @@ public class Database implements StorageObject {
     ResultSet rs;\r
     try {\r
       rs = stmt.executeQuery(sql);\r
-      theLog.printInfo((System.currentTimeMillis() - startTime) + "ms. for: "\r
-                       + sql);\r
+      //theLog.printInfo((System.currentTimeMillis() - startTime) + "ms. for: " + sql);\r
     }\r
     catch (SQLException e)\r
     {\r
-      theLog.printDebugInfo("Failed: " + (System.currentTimeMillis()\r
-          - startTime) + "ms. for: "+ sql);\r
+      theLog.printDebugInfo("Failed: " + (System.currentTimeMillis() - startTime) + "ms. for: "+ sql);\r
       throw e;\r
     }\r
 \r
@@ -1127,8 +1109,7 @@ public class Database implements StorageObject {
       freeConnection(con,stmt);\r
     }\r
     //theLog.printInfo(theTable + " has "+ result +" rows where " + where);\r
-    theLog.printInfo((System.currentTimeMillis() - startTime) + "ms. for: "\r
-                     + sql);\r
+    //theLog.printInfo((System.currentTimeMillis() - startTime) + "ms. for: " + sql);\r
     return result;\r
   }\r
 \r
@@ -1140,8 +1121,7 @@ public class Database implements StorageObject {
     try\r
     {\r
       rs = stmt.executeUpdate(sql);\r
-      theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms. for: "\r
-                       + sql);\r
+      //theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms. for: " + sql);\r
     }\r
     catch (SQLException e)\r
     {\r
@@ -1164,13 +1144,13 @@ public class Database implements StorageObject {
       result = pstmt.executeUpdate();\r
     }\r
     catch (Exception e) {\r
-      theLog.printDebugInfo("settimage :: setImage failed: "+e.getMessage());\r
+      theLog.printDebugInfo("executeUpdate failed: "+e.getMessage());\r
       throw new StorageObjectException("executeUpdate failed: "+e.getMessage());\r
     }\r
     finally {\r
       freeConnection(con,pstmt);\r
     }\r
-    theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms. for: " + sql);\r
+    //theLog.printInfo((new java.util.Date().getTime() - startTime) + "ms. for: " + sql);\r
     return result;\r
   }\r
 \r
@@ -1220,7 +1200,7 @@ public class Database implements StorageObject {
     try {\r
       con = getPooledCon();\r
       pstmt = con.prepareStatement(sql);\r
-      theLog.printInfo("METADATA: " + sql);\r
+      //theLog.printInfo("METADATA: " + sql);\r
       ResultSet rs = pstmt.executeQuery();\r
       evalMetaData(rs.getMetaData());\r
       rs.close();\r