[Neuclear-develop] neuclear-ledger/src/java/org/neuclear/ledger/servlets LedgerServlet.java,1.1,1.2

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

Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/servlets
In directory sc8-pr-cvs1:/tmp/cvs-serv2351/src/java/org/neuclear/ledger/servlets

Modified Files:
	LedgerServlet.java 
Log Message:
Added Drivers for handling different Database dialects in the entity model.
Added Statement pattern to ledger, simplifying the statement writing process.

Index: LedgerServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/servlets/LedgerServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LedgerServlet.java	29 Dec 2003 22:40:15 -0000	1.1
--- LedgerServlet.java	31 Dec 2003 00:39:04 -0000	1.2
***************
*** 8,11 ****
--- 8,15 ----
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.ledger.implementations.SQLLedger;
+ import org.neuclear.ledger.browser.Statement;
+ import org.neuclear.ledger.browser.StatementEntry;
+ import org.neuclear.ledger.UnknownBookException;
+ import org.neuclear.ledger.LowlevelLedgerException;
  
  import javax.servlet.http.HttpServlet;
***************
*** 46,49 ****
--- 50,57 ----
  $Id$
  $Log$
+ Revision 1.2  2003/12/31 00:39:04  pelle
+ Added Drivers for handling different Database dialects in the entity model.
+ Added Statement pattern to ledger, simplifying the statement writing process.
+ 
  Revision 1.1  2003/12/29 22:40:15  pelle
  Added LedgerServlet and friends
***************
*** 66,71 ****
                          serviceid
                  );
-             ledger.createLedger(serviceid);
- 
          } catch (Exception e) {
              throw new ServletException(e);
--- 74,77 ----
***************
*** 78,86 ****
          PrintWriter out=response.getWriter();
          ServletTools.printHeader(out,request,"Account Browser");
!         String url=request.getServletPath();
          try {
-             Connection con=consrc.getConnection();
-             PreparedStatement stmt=con.prepareStatement("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\n" +
-                     "and (s.bookid = ? ) and t.ledgerid=?");
              Principal user=request.getUserPrincipal();
              String book=request.getPathInfo();
--- 84,89 ----
          PrintWriter out=response.getWriter();
          ServletTools.printHeader(out,request,"Account Browser");
!         String url=ServletTools.getAbsoluteURL(request,request.getServletPath());
          try {
              Principal user=request.getUserPrincipal();
              String book=request.getPathInfo();
***************
*** 89,113 ****
              else
                  book="neu:/"+book;
!             stmt.setString(1,book);
!             stmt.setString(2,book);
!             stmt.setString(3,serviceid);
!             ResultSet rs=stmt.executeQuery();
              out.println("<table><tr><th>Transaction ID</th><th>Time</th><th>Counterparty</th><th>Comment</th><th>Amount</th></tr>");
!             while(rs.next()){
!                 final BigDecimal amount = rs.getBigDecimal(5);
                  out.print("<tr");
                  if (amount.compareTo(ZERO)<0)
                      out.print(" class=\"negative\"");
!                 out.print("><td>");
!                 out.print(rs.getString(1));
                  out.print("</td><td>");
!                 out.print(TimeTools.formatTimeStamp(rs.getTimestamp(2)));
                  out.print("</td><td><a href=\"");
                  out.print(url);
!                 out.print(NSTools.name2path(rs.getString(3)));
                  out.println("\">");
!                 out.print(rs.getString(3));
                  out.print("</a></td><td>");
!                 out.print(rs.getString(4));
                  out.print("</td><td>");
                  out.print(amount);
--- 92,116 ----
              else
                  book="neu:/"+book;
!             Statement stmt=ledger.browse(ledger.getBook(book));
              out.println("<table><tr><th>Transaction ID</th><th>Time</th><th>Counterparty</th><th>Comment</th><th>Amount</th></tr>");
!             while(stmt.next()){
!                 final BigDecimal amount = stmt.getAmount();
                  out.print("<tr");
                  if (amount.compareTo(ZERO)<0)
                      out.print(" class=\"negative\"");
!                 out.print("><td style=\"size:small\">");
!                 out.print(stmt.getXid());
                  out.print("</td><td>");
!                 out.print(TimeTools.formatTimeStampShort(stmt.getValuetime()));
                  out.print("</td><td><a href=\"");
                  out.print(url);
!                 if (NSTools.isValidName(stmt.getCounterparty()))
!                     out.print(NSTools.name2path(stmt.getCounterparty()));
!                 else
!                     out.print("/"+stmt.getCounterparty());
                  out.println("\">");
!                 out.print(stmt.getCounterparty());
                  out.print("</a></td><td>");
!                 out.print(stmt.getComment());
                  out.print("</td><td>");
                  out.print(amount);
***************
*** 116,122 ****
              }
              out.println("</table>");
-         } catch (SQLException e) {
-             e.printStackTrace(out);
          } catch (InvalidNamedObjectException e) {
              e.printStackTrace();
          }
--- 119,127 ----
              }
              out.println("</table>");
          } catch (InvalidNamedObjectException e) {
+             e.printStackTrace();
+         } catch (UnknownBookException e) {
+             e.printStackTrace();
+         } catch (LowlevelLedgerException e) {
              e.printStackTrace();
          }