|
From: Pelle B. <pe...@us...> - 2004-04-12 19:41:12
|
Update of /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32058/src/java/org/neuclear/ledger/hibernate Modified Files: HHeld.java HTransaction.java HibernateLedger.java Log Message: Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests. Index: HHeld.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HHeld.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HHeld.java 31 Mar 2004 23:11:30 -0000 1.4 --- HHeld.java 12 Apr 2004 19:27:19 -0000 1.5 *************** *** 106,110 **** unp.addItem(item.getBook(), item.getAmount()); } ! return new PostedHeldTransaction(unp, transactionTime); } --- 106,114 ---- unp.addItem(item.getBook(), item.getAmount()); } ! ! PostedHeldTransaction tran = new PostedHeldTransaction(unp, transactionTime); ! tran.setReceiptId(receipt); ! return tran; ! } Index: HibernateLedger.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HibernateLedger.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** HibernateLedger.java 6 Apr 2004 22:52:34 -0000 1.13 --- HibernateLedger.java 12 Apr 2004 19:27:19 -0000 1.14 *************** *** 362,372 **** try { Session ses = factory.openSession(); ! HHeld held = (HHeld) ses.get(HHeld.class, idstring); ! if (held == null) { ses.close(); ! return held.createPosted(); } ses.close(); ! throw new UnknownTransactionException(this, idstring); } catch (HibernateException e) { throw new LowlevelLedgerException(e); --- 362,374 ---- try { Session ses = factory.openSession(); ! net.sf.hibernate.Transaction t = ses.beginTransaction(); ! HHeld tran = (HHeld) ses.get(HHeld.class, idstring); ! if (tran == null) { ses.close(); ! throw new UnknownTransactionException(this, idstring); } + PostedHeldTransaction ph = tran.createPosted(); ses.close(); ! return ph; } catch (HibernateException e) { throw new LowlevelLedgerException(e); *************** *** 386,389 **** --- 388,393 ---- } tran.setReceipt(receipt); + ses.flush(); + // ses.update(tran); t.commit(); ses.close(); *************** *** 404,407 **** --- 408,412 ---- } tran.setReceipt(receipt); + ses.flush(); t.commit(); ses.close(); Index: HTransaction.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HTransaction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** HTransaction.java 31 Mar 2004 23:11:30 -0000 1.6 --- HTransaction.java 12 Apr 2004 19:27:19 -0000 1.7 *************** *** 88,92 **** unp.addItem(item.getBook(), item.getAmount()); } ! return new PostedTransaction(unp, transactionTime); } --- 88,94 ---- unp.addItem(item.getBook(), item.getAmount()); } ! PostedTransaction tran = new PostedTransaction(unp, transactionTime); ! tran.setReceiptId(receipt); ! return tran; } |