[Neuclear-develop] neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate HHeld.hbm.xml,1.4,1.5 HHeld.java,1.2,1.3 HTransaction.java,1.4,1.5 HibernateLedger.java,1.7,1.8

[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-serv9393/src/java/org/neuclear/ledger/hibernate

Modified Files:
	HHeld.hbm.xml HHeld.java HTransaction.java 
	HibernateLedger.java 
Log Message:
Now passes all unit tests


Index: HHeld.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HHeld.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HHeld.java	25 Mar 2004 19:04:17 -0000	1.2
--- HHeld.java	25 Mar 2004 21:40:45 -0000	1.3
***************
*** 27,31 ****
          this.comment = tran.getComment();
          this.cancelled = false;
!         this.completed = null;
          final List ol = tran.getItemList();
          this.items = new HashSet(ol.size());
--- 27,31 ----
          this.comment = tran.getComment();
          this.cancelled = false;
!         this.completedId = null;
          final List ol = tran.getItemList();
          this.items = new HashSet(ol.size());
***************
*** 92,101 ****
      }
  
!     public HTransaction getCompleted() {
!         return completed;
      }
  
!     public void setCompleted(HTransaction transaction) {
!         this.completed = transaction;
      }
  
--- 92,101 ----
      }
  
!     public String getCompletedId() {
!         return completedId;
      }
  
!     public void setCompletedId(String completedId) {
!         this.completedId = completedId;
      }
  
***************
*** 117,120 ****
      private Set items;
      private boolean cancelled;
!     private HTransaction completed;
  }
--- 117,120 ----
      private Set items;
      private boolean cancelled;
!     private String completedId;
  }

Index: HHeld.hbm.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HHeld.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HHeld.hbm.xml	25 Mar 2004 19:04:17 -0000	1.4
--- HHeld.hbm.xml	25 Mar 2004 21:40:45 -0000	1.5
***************
*** 30,34 ****
                  not-null="true"/>
          </property>
!         <one-to-one name="completed" class="org.neuclear.ledger.hibernate.HTransaction" cascade="none" foreign-key="completed_id"/>
          <property name="comment">
              <column name="comment" sql-type="varchar(255)"
--- 30,37 ----
                  not-null="true"/>
          </property>
!         <property name="completedId">
!             <column name="completed_id" sql-type="char(32)"
!                 not-null="false"/>
!         </property>
          <property name="comment">
              <column name="comment" sql-type="varchar(255)"

Index: HibernateLedger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HibernateLedger.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HibernateLedger.java	25 Mar 2004 19:04:17 -0000	1.7
--- HibernateLedger.java	25 Mar 2004 21:40:45 -0000	1.8
***************
*** 184,188 ****
              }
              final Date time = new Date();
!             if (posted.getExpiryTime().before(time) || posted.isCancelled() || posted.getCompleted() != null) {
                  ses.close();
                  throw new TransactionExpiredException(this, hold);
--- 184,188 ----
              }
              final Date time = new Date();
!             if (posted.getExpiryTime().before(time) || posted.isCancelled() || posted.getCompletedId() != null) {
                  ses.close();
                  throw new TransactionExpiredException(this, hold);
***************
*** 191,195 ****
              htran.setComment(comment);
              ses.save(htran);
!             posted.setCompleted(htran);
              ses.update(htran);
              t.commit();
--- 191,195 ----
              htran.setComment(comment);
              ses.save(htran);
!             posted.setCompletedId(htran.getId());
              ses.update(htran);
              t.commit();
***************
*** 274,278 ****
          try {
              Session ses = factory.openSession();
!             Query q = ses.createQuery("select sum(item.amount) from HHeldItem item where item.book = ? and item.amount<0 and item.held.expiryTime > ? and item.held.cancelled=false and item.held.completed = null");
              q.setString(0, book);
              q.setTimestamp(1, new Date());
--- 274,278 ----
          try {
              Session ses = factory.openSession();
!             Query q = ses.createQuery("select sum(item.amount) from HHeldItem item where item.book = ? and item.amount<0 and item.held.expiryTime > ? and item.held.cancelled=false and item.held.completedId is null");
              q.setString(0, book);
              q.setTimestamp(1, new Date());

Index: HTransaction.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HTransaction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HTransaction.java	25 Mar 2004 19:04:17 -0000	1.4
--- HTransaction.java	25 Mar 2004 21:40:45 -0000	1.5
***************
*** 38,42 ****
          this.transactionTime = transactionTime;
          this.comment = held.getComment();
!         this.items = held.getItems();
      }
  
--- 38,47 ----
          this.transactionTime = transactionTime;
          this.comment = held.getComment();
!         this.items = new HashSet();
!         Iterator iter = held.getItems().iterator();
!         while (iter.hasNext()) {
!             HHeldItem item = (HHeldItem) iter.next();
!             items.add(new HTransactionItem(this, item.getBook(), item.getAmount()));
!         }
      }