|
From: Pelle B. <pe...@us...> - 2004-03-29 20:24:28
|
Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/servlets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6815/src/java/org/neuclear/ledger/servlets Modified Files: LedgerServlet.java Log Message: LedgerServlet works now at least for a straight non date restricted browse. Index: LedgerServlet.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/servlets/LedgerServlet.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** LedgerServlet.java 26 Mar 2004 23:36:34 -0000 1.6 --- LedgerServlet.java 29 Mar 2004 20:05:16 -0000 1.7 *************** *** 3,9 **** import org.neuclear.commons.Utility; import org.neuclear.commons.servlets.ServletTools; - import org.neuclear.commons.sql.JNDIConnectionSource; - import org.neuclear.commons.sql.statements.SimpleStatementFactory; - import org.neuclear.commons.sql.statements.StatementFactory; import org.neuclear.commons.time.TimeTools; import org.neuclear.id.InvalidNamedObjectException; --- 3,6 ---- *************** *** 12,15 **** --- 9,13 ---- import org.neuclear.ledger.browser.BookBrowser; import org.neuclear.ledger.browser.LedgerBrowser; + import org.neuclear.ledger.simple.PopulatedSimpleLedger; import javax.servlet.ServletConfig; *************** *** 18,25 **** import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import javax.sql.DataSource; import java.io.IOException; import java.io.PrintWriter; - import java.math.BigDecimal; import java.security.Principal; --- 16,21 ---- *************** *** 44,47 **** --- 40,46 ---- $Id$ $Log$ + Revision 1.7 2004/03/29 20:05:16 pelle + LedgerServlet works now at least for a straight non date restricted browse. + Revision 1.6 2004/03/26 23:36:34 pelle The simple browse(book) now works on hibernate, I have implemented the other two, which currently don not constrain the query correctly. *************** *** 72,85 **** public class LedgerServlet extends HttpServlet { public void init(ServletConfig config) throws ServletException { - datasource = ServletTools.getInitParam("datasource", config); serviceid = ServletTools.getInitParam("serviceid", config); try { ! fact = new SimpleStatementFactory(new JNDIConnectionSource(datasource)); ! // ledger= new SQLLedger( ! // fact, ! // serviceid ! // ); ! // if (!ledger.bookExists("neu://alice@test")) ! // PopulateLedger.main(null); } catch (Exception e) { throw new ServletException(e); --- 71,77 ---- public class LedgerServlet extends HttpServlet { public void init(ServletConfig config) throws ServletException { serviceid = ServletTools.getInitParam("serviceid", config); try { ! ledger = new PopulatedSimpleLedger(serviceid); } catch (Exception e) { throw new ServletException(e); *************** *** 99,103 **** book = serviceid; else ! book = "neu:/" + book; BookBrowser stmt = ledger.browse(book); out.println("<table><tr><th>Transaction ID</th><th>Time</th><th>Counterparty</th><th>Comment</th><th>Amount</th></tr>"); --- 91,96 ---- book = serviceid; else ! book = book.substring(1); ! System.out.println("Browsing: " + book); BookBrowser stmt = ledger.browse(book); out.println("<table><tr><th>Transaction ID</th><th>Time</th><th>Counterparty</th><th>Comment</th><th>Amount</th></tr>"); *************** *** 134,142 **** } - private DataSource ds; - private String datasource; private String serviceid; - private static final BigDecimal ZERO = new BigDecimal(0); private LedgerBrowser ledger; - private StatementFactory fact; } --- 127,131 ---- |