[Neuclear-develop] neuclear-ledger/src/java/org/neuclear/ledger/browser BookBrowser.java,1.2,1.3 QueryBookBrowser.java,1.2,1.3

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/browser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16197/src/java/org/neuclear/ledger/browser

Modified Files:
	BookBrowser.java QueryBookBrowser.java 
Log Message:
The first shell for the HibernateBookBrowser

Index: QueryBookBrowser.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/browser/QueryBookBrowser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QueryBookBrowser.java	21 Mar 2004 00:48:35 -0000	1.2
--- QueryBookBrowser.java	25 Mar 2004 22:04:46 -0000	1.3
***************
*** 30,33 ****
--- 30,36 ----
  $Id$
  $Log$
+ Revision 1.3  2004/03/25 22:04:46  pelle
+ The first shell for the HibernateBookBrowser
+ 
  Revision 1.2  2004/03/21 00:48:35  pelle
  The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
***************
*** 101,105 ****
              if (!rs.next())
                  return false;
!             setRow(rs.getString(1), rs.getString(3), rs.getString(4), rs.getTimestamp(2), rs.getBigDecimal(5));
              return true;
          } catch (SQLException e) {
--- 104,108 ----
              if (!rs.next())
                  return false;
!             setRow(rs.getString(1), rs.getString(2), rs.getString(4), rs.getString(5), rs.getTimestamp(3), rs.getBigDecimal(6));
              return true;
          } catch (SQLException e) {
***************
*** 111,115 ****
      private final Ledger ledger;
      private boolean next;
!     private static final String BASE_QUERY = "select t.id,t.valuetime, r.bookid,t.comment,s.amount from entry s,entry r, transaction t where s.transactionid=t.id and r.transactionid=t.id and r.id<>s.id\nand s.bookid = ? and t.ledgerid=?";
      private static final String UNTIL_CLAUSE = " AND t.valuetime<=?";
      private static final String FROM_CLAUSE = " AND t.valuetime>?";
--- 114,118 ----
      private final Ledger ledger;
      private boolean next;
!     private static final String BASE_QUERY = "select t.id,t.request_id, t.valuetime, r.bookid,t.comment,s.amount from entry s,entry r, transaction t where s.transactionid=t.id and r.transactionid=t.id and r.id<>s.id\nand s.bookid = ? and t.ledgerid=?";
      private static final String UNTIL_CLAUSE = " AND t.valuetime<=?";
      private static final String FROM_CLAUSE = " AND t.valuetime>?";

Index: BookBrowser.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/browser/BookBrowser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BookBrowser.java	21 Mar 2004 00:48:35 -0000	1.2
--- BookBrowser.java	25 Mar 2004 22:04:45 -0000	1.3
***************
*** 26,29 ****
--- 26,32 ----
  $Id$
  $Log$
+ Revision 1.3  2004/03/25 22:04:45  pelle
+ The first shell for the HibernateBookBrowser
+ 
  Revision 1.2  2004/03/21 00:48:35  pelle
  The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
***************
*** 51,56 ****
  
  
!     protected final void setRow(String xid, String counterparty, String comment, Timestamp valuetime, BigDecimal amount) {
!         this.xid = xid;
          this.counterparty = counterparty;
          this.comment = comment;
--- 54,60 ----
  
  
!     protected final void setRow(String xid, String reqid, String counterparty, String comment, Timestamp valuetime, BigDecimal amount) {
!         this.id = xid;
!         this.reqid = reqid;
          this.counterparty = counterparty;
          this.comment = comment;
***************
*** 63,68 ****
      }
  
!     public String getXid() {
!         return xid;
      }
  
--- 67,76 ----
      }
  
!     public String getId() {
!         return id;
!     }
! 
!     public String getRequestId() {
!         return reqid;
      }
  
***************
*** 85,89 ****
      private final String book;
  
!     private String xid;
      private String counterparty;
      private String comment;
--- 93,98 ----
      private final String book;
  
!     private String id;
!     private String reqid;
      private String counterparty;
      private String comment;