[Babeldoc-devel] babeldoc/modules/sql/src/com/babeldoc/sql/journal GenericSqlJournal.java,1.11,1.12 OracleJournal.java,1.5,1.6

[bruce m. <tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/journal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/sql/src/com/babeldoc/sql/journal

Modified Files:
	GenericSqlJournal.java OracleJournal.java 
Log Message:
Logging cleanups...

1.  Created log instance variable instead of calling LogService.getInstance().
2.  All logs to debug check if debug level is set.

Index: OracleJournal.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/journal/OracleJournal.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OracleJournal.java	27 Jun 2003 02:05:58 -0000	1.5
--- OracleJournal.java	24 Jul 2004 00:18:53 -0000	1.6
***************
*** 98,101 ****
--- 98,104 ----
    public static final String SELECT_BLOB = "journalSelectBlobForUpdate-oracle";
  
+   /** Log service to use */
+   private LogService log = LogService.getInstance(this.getClass().getName());
+ 
    /**
     * writeDelta - this method involves lots of db specific trickery (in this
***************
*** 111,115 ****
    protected void writeDelta(Connection con, long id, long step,
      PipelineDocument doc) throws SQLException {
!     LogService.getInstance().logDebug("[Oracle.writeDelta] called");
  
      String insertStmt = SqlQueryManager.getSqlQuery(DELTA_MAKEROW);
--- 114,120 ----
    protected void writeDelta(Connection con, long id, long step,
      PipelineDocument doc) throws SQLException {
!     
!     if(log.isDebugEnabled())
!     	log.logDebug("[Oracle.writeDelta] called");
  
      String insertStmt = SqlQueryManager.getSqlQuery(DELTA_MAKEROW);
***************
*** 120,124 ****
  
      try {
!       LogService.getInstance().logDebug("[Oracle.writeDelta] Creating journal row");
        con.setAutoCommit(false);
        pstmt = con.prepareStatement(insertStmt);
--- 125,130 ----
  
      try {
!     	if(log.isDebugEnabled())
!       	log.logDebug("[Oracle.writeDelta] Creating journal row");
        con.setAutoCommit(false);
        pstmt = con.prepareStatement(insertStmt);
***************
*** 149,156 ****
        con.commit();
  
!       LogService.getInstance().logDebug("Commited");
      } catch (Exception e) {
!       com.babeldoc.core.LogService.getInstance().logError("Error updating document",
!         e);
        con.rollback();
        throw new SQLException(e.toString());
--- 155,162 ----
        con.commit();
  
! 			if(log.isDebugEnabled())
!       	log.logDebug("Committed");
      } catch (Exception e) {
!       log.logError("Error updating document", e);
        con.rollback();
        throw new SQLException(e.toString());
***************
*** 169,173 ****
          }
        } catch (Exception e) {
!         com.babeldoc.core.LogService.getInstance().logError("Closing objects", e);
        }
      }
--- 175,179 ----
          }
        } catch (Exception e) {
!         log.logError("Closing objects", e);
        }
      }

Index: GenericSqlJournal.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/journal/GenericSqlJournal.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GenericSqlJournal.java	3 Sep 2003 03:25:32 -0000	1.11
--- GenericSqlJournal.java	24 Jul 2004 00:18:53 -0000	1.12
***************
*** 126,129 ****
--- 126,132 ----
    private SqlJournalInfo info;
  
+   /** logging for this class */
+   private LogService log = LogService.getInstance(this.getClass().getName());
+ 
    /**
     * getChildrenTickets.  Get all the tickets which are children of this ticket
***************
*** 148,153 ****
  
        String query = SqlQueryManager.getSqlQuery(LOG_QUERY_ALL_OTHER_VALUES);
!       LogService.getInstance().logDebug("[GenericSqlJournal.getTickets] query: " +
!         query.toString());
        pstmt = con.prepareStatement(query);
        pstmt.setString(1, Long.toString(((JournalTicket) parent).getValue()));
--- 151,156 ----
  
        String query = SqlQueryManager.getSqlQuery(LOG_QUERY_ALL_OTHER_VALUES);
!       if(log.isDebugEnabled())
!       	log.logDebug("[GenericSqlJournal.getTickets] query: " + query.toString());
        pstmt = con.prepareStatement(query);
        pstmt.setString(1, Long.toString(((JournalTicket) parent).getValue()));
***************
*** 178,182 ****
          getResource().checkIn(con);
        } catch (Exception ex) {
!         LogService.getInstance().logError(I18n.get("sql.403"), ex);
        }
      }
--- 181,185 ----
          getResource().checkIn(con);
        } catch (Exception ex) {
!         log.logError(I18n.get("sql.403"), ex);
        }
      }
***************
*** 229,233 ****
          getResource().checkIn(con);
        } catch (Exception ex) {
!         LogService.getInstance().logError(ex);
        }
      }
--- 232,236 ----
          getResource().checkIn(con);
        } catch (Exception ex) {
!         log.logError(ex);
        }
      }
***************
*** 254,258 ****
            ((JournalTicket) ticket).getValue(), step));
      } catch (Exception e) {
!       LogService.getInstance().logError(e);
        throw new JournalException("[GenericSqlJournal.getDocumentAtTicketStep]",
          e);
--- 257,261 ----
            ((JournalTicket) ticket).getValue(), step));
      } catch (Exception e) {
!       log.logError(e);
        throw new JournalException("[GenericSqlJournal.getDocumentAtTicketStep]",
          e);
***************
*** 261,265 ****
          getResource().checkIn(con);
        } catch (Exception e) {
!         LogService.getInstance().logError(e);
          throw new JournalException("[GenericSqlJournal.getDocumentAtTicketStep]",
            e);
--- 264,268 ----
          getResource().checkIn(con);
        } catch (Exception e) {
!         log.logError(e);
          throw new JournalException("[GenericSqlJournal.getDocumentAtTicketStep]",
            e);
***************
*** 327,331 ****
          getResource().checkIn(con);
        } catch (Exception ex) {
!         LogService.getInstance().logError(ex);
        }
      }
--- 330,334 ----
          getResource().checkIn(con);
        } catch (Exception ex) {
!         log.logError(ex);
        }
      }
***************
*** 440,444 ****
          }
        } catch (Exception e) {
!         LogService.getInstance().logError("[GenericSqlJournal.getNextStep] close",
            e);
        }
--- 443,447 ----
          }
        } catch (Exception e) {
!         log.logError("[GenericSqlJournal.getNextStep] close",
            e);
        }
***************
*** 675,679 ****
          }
        } catch (Exception se) {
!         LogService.getInstance().logError(se);
        } finally {
          try {
--- 678,682 ----
          }
        } catch (Exception se) {
!         log.logError(se);
        } finally {
          try {
***************
*** 684,688 ****
            getResource().checkIn(con);
          } catch (Exception se) {
!           LogService.getInstance().logError(I18n.get("sql.403"), se);
          }
        }
--- 687,691 ----
            getResource().checkIn(con);
          } catch (Exception se) {
!           log.logError(I18n.get("sql.403"), se);
          }
        }
***************
*** 743,747 ****
          }
        } catch (Exception e) {
!         LogService.getInstance().logError(I18n.get("sql.403"), e);
        }
      }
--- 746,750 ----
          }
        } catch (Exception e) {
!         log.logError(I18n.get("sql.403"), e);
        }
      }
***************
*** 785,789 ****
        }
      } catch (Exception e) {
!       LogService.getInstance().logError(e);
        throw new SQLException(e.toString());
      } finally {
--- 788,792 ----
        }
      } catch (Exception e) {
!       log.logError(e);
        throw new SQLException(e.toString());
      } finally {
***************
*** 793,797 ****
          }
        } catch (Exception e) {
!         LogService.getInstance().logError(I18n.get("sql.403"), e);
        }
      }
--- 796,800 ----
          }
        } catch (Exception e) {
!         log.logError(I18n.get("sql.403"), e);
        }
      }