From: mh <mh>
Date: Mon, 23 Dec 2002 03:18:02 +0000 (+0000)
Subject: quiet some unnecessary logging and remove some unused stuff
X-Git-Tag: BEFORE_MERGE_1_1~372
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=31fb6ae5e3e2fdf802c846dea930f7c80e426cdf;p=mir.git

quiet some unnecessary logging and remove some unused stuff
---

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