[Neuclear-develop] neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate HibernateBookBrowser.java,1.1,1.2 HibernateLedger.java,1.9,1.10

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

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

Modified Files:
	HibernateBookBrowser.java HibernateLedger.java 
Log Message:
The simple browse(book) now works on hibernate, I have implemented the other two, which currently don not constrain the query correctly.

Index: HibernateLedger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HibernateLedger.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HibernateLedger.java	26 Mar 2004 18:38:27 -0000	1.9
--- HibernateLedger.java	26 Mar 2004 23:36:50 -0000	1.10
***************
*** 381,390 ****
      }
  
!     public BookBrowser browseFrom(String book, Timestamp from) throws LowlevelLedgerException {
!         return null;
      }
  
!     public BookBrowser browseRange(String book, Timestamp from, Timestamp until) throws LowlevelLedgerException {
!         return null;
      }
  
--- 381,411 ----
      }
  
!     public BookBrowser browseFrom(String book, Date from) throws LowlevelLedgerException {
!         try {
!             Session ses = factory.openSession();
!             Query q = ses.createQuery("from HTransactionItem item where item.book=? and item.transaction.transactionTime>=?");
!             q.setString(0, book);
!             q.setDate(1, from);
!             Iterator iter = q.iterate();
!             return new HibernateBookBrowser(iter, book);
!         } catch (HibernateException e) {
!             throw new LowlevelLedgerException(e);
!         }
! 
      }
  
!     public BookBrowser browseRange(String book, Date from, Date until) throws LowlevelLedgerException {
!         try {
!             Session ses = factory.openSession();
!             Query q = ses.createQuery("from HTransactionItem item where item.book=? and item.transaction.transactionTime>=? and item.transaction.transactionTime<?");
!             q.setString(0, book);
!             q.setDate(1, from);
!             q.setDate(1, until);
!             Iterator iter = q.iterate();
!             return new HibernateBookBrowser(iter, book);
!         } catch (HibernateException e) {
!             throw new LowlevelLedgerException(e);
!         }
! 
      }
  

Index: HibernateBookBrowser.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HibernateBookBrowser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HibernateBookBrowser.java	25 Mar 2004 22:05:20 -0000	1.1
--- HibernateBookBrowser.java	26 Mar 2004 23:36:50 -0000	1.2
***************
*** 26,29 ****
--- 26,32 ----
  $Id$
  $Log$
+ Revision 1.2  2004/03/26 23:36:50  pelle
+ The simple browse(book) now works on hibernate, I have implemented the other two, which currently don not constrain the query correctly.
+ 
  Revision 1.1  2004/03/25 22:05:20  pelle
  First shell of the HibernateBookBrowser
***************
*** 43,47 ****
  
      public boolean next() throws LowlevelLedgerException {
!         return false;
      }
  
--- 46,63 ----
  
      public boolean next() throws LowlevelLedgerException {
!         if (!iter.hasNext())
!             return false;
!         HTransactionItem item = (HTransactionItem) iter.next();
!         final HTransaction tran = item.getTransaction();
!         String counterparty = null;
!         Iterator iter = tran.getItems().iterator();
!         while (iter.hasNext()) {
!             HTransactionItem party = (HTransactionItem) iter.next();
!             if (!party.getBook().equals(item.getBook())) {
!                 counterparty = party.getBook();
!             }
!         }
!         setRow(tran.getId(), tran.getRequestId(), counterparty, tran.getComment(), tran.getTransactionTime(), item.getAmount(), null, null, null);
!         return true;
      }