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

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

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

Modified Files:
	LedgerBrowserServlet.java 
Log Message:
Reworked the ID's of the transactions. The primary ID is now the request ID.
Receipt ID's are optional and added using a separate set method.
The various interactive passphrase agents now have shell methods for the new interactive approach.

Index: LedgerBrowserServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/servlets/LedgerBrowserServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LedgerBrowserServlet.java	29 Mar 2004 23:43:30 -0000	1.1
--- LedgerBrowserServlet.java	31 Mar 2004 23:11:09 -0000	1.2
***************
*** 2,6 ****
  
  import org.neuclear.commons.Utility;
- import org.neuclear.commons.configuration.ConfigurableContainer;
  import org.neuclear.commons.servlets.ServletTools;
  import org.neuclear.commons.time.TimeTools;
--- 2,5 ----
***************
*** 8,12 ****
  import org.neuclear.id.NSTools;
  import org.neuclear.ledger.LowlevelLedgerException;
- import org.neuclear.ledger.Ledger;
  import org.neuclear.ledger.browser.BookBrowser;
  import org.neuclear.ledger.browser.LedgerBrowser;
--- 7,10 ----
***************
*** 21,27 ****
  import java.io.PrintWriter;
  import java.security.Principal;
- import java.util.Date;
- import java.sql.Timestamp;
  import java.text.ParseException;
  
  /*
--- 19,24 ----
  import java.io.PrintWriter;
  import java.security.Principal;
  import java.text.ParseException;
+ import java.util.Date;
  
  /*
***************
*** 45,48 ****
--- 42,50 ----
  $Id$
  $Log$
+ Revision 1.2  2004/03/31 23:11:09  pelle
+ Reworked the ID's of the transactions. The primary ID is now the request ID.
+ Receipt ID's are optional and added using a separate set method.
+ The various interactive passphrase agents now have shell methods for the new interactive approach.
+ 
  Revision 1.1  2004/03/29 23:43:30  pelle
  The servlets now work and display the ledger contents.
***************
*** 84,88 ****
  //            ConfigurableContainer pico=(ConfigurableContainer) getServletContext().getAttribute("pico");
  //            ledger = (LedgerBrowser) pico.getComponentInstance(Ledger.class) ;
!             ledger=new PopulatedSimpleLedger(serviceid);
          } catch (Exception e) {
              e.printStackTrace();
--- 86,90 ----
  //            ConfigurableContainer pico=(ConfigurableContainer) getServletContext().getAttribute("pico");
  //            ledger = (LedgerBrowser) pico.getComponentInstance(Ledger.class) ;
!             ledger = new PopulatedSimpleLedger(serviceid);
          } catch (Exception e) {
              e.printStackTrace();
***************
*** 106,116 ****
              System.out.println("Browsing: " + book);
  
!             String fromStr=request.getParameter("from");
!             String toStr=request.getParameter("to");
  
!             Date from=parseDate(fromStr);
!             Date to=parseDate(toStr);
  
!             BookBrowser stmt = browse(book,from,to);
              out.println("<table><tr><th>Transaction ID</th><th>Time</th><th>Counterparty</th><th>Comment</th><th>Amount</th></tr>");
              while (stmt.next()) {
--- 108,118 ----
              System.out.println("Browsing: " + book);
  
!             String fromStr = request.getParameter("from");
!             String toStr = request.getParameter("to");
  
!             Date from = parseDate(fromStr);
!             Date to = parseDate(toStr);
  
!             BookBrowser stmt = browse(book, from, to);
              out.println("<table><tr><th>Transaction ID</th><th>Time</th><th>Counterparty</th><th>Comment</th><th>Amount</th></tr>");
              while (stmt.next()) {
***************
*** 120,124 ****
                      out.print(" class=\"negative\"");
                  out.print("><td style=\"size:small\">");
!                 out.print(stmt.getId());
                  out.print("</td><td>");
                  out.print(TimeTools.formatTimeStampShort(stmt.getValuetime()));
--- 122,126 ----
                      out.print(" class=\"negative\"");
                  out.print("><td style=\"size:small\">");
!                 out.print(stmt.getRequestId());
                  out.print("</td><td>");
                  out.print(TimeTools.formatTimeStampShort(stmt.getValuetime()));
***************
*** 146,159 ****
      }
  
!     private BookBrowser browse(String book,Date from, Date to) throws LowlevelLedgerException {
!         if (from!=null){
!             if (to!=null)
!                 return ledger.browseRange(book,from,to);
!             return ledger.browseFrom(book,from);
          }
          return ledger.browse(book);
      }
  
!     private Date parseDate(String fromStr)  {
          if (Utility.isEmpty(fromStr))
              return null;
--- 148,161 ----
      }
  
!     private BookBrowser browse(String book, Date from, Date to) throws LowlevelLedgerException {
!         if (from != null) {
!             if (to != null)
!                 return ledger.browseRange(book, from, to);
!             return ledger.browseFrom(book, from);
          }
          return ledger.browse(book);
      }
  
!     private Date parseDate(String fromStr) {
          if (Utility.isEmpty(fromStr))
              return null;