[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/servlet IDRSServlet.java,1.13,1.14 Init.ja
Brought to you by:
bigman921
|
From: Marc B. <big...@us...> - 2002-09-16 15:19:45
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv11935/dev/src/net/sourceforge/idrs/core/servlet
Modified Files:
IDRSServlet.java Init.java
Log Message:
Added data paging support, fixed hot deployment bug
Index: IDRSServlet.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IDRSServlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IDRSServlet.java 9 Sep 2002 21:27:44 -0000 1.13
--- IDRSServlet.java 16 Sep 2002 15:19:42 -0000 1.14
***************
*** 316,320 ****
ERRORS:Incorrect Parameters
*/
! private void addVars(IDRSSecurity secure, RequestWrapper req, IDRSRep rep)
throws Exception {
String currentDB = "";
--- 316,320 ----
ERRORS:Incorrect Parameters
*/
! private void addVars(IDRSSecurity secure, RequestWrapper req, IDRSRep rep,HttpSession session)
throws Exception {
String currentDB = "";
***************
*** 325,329 ****
//retrieve the report header
IDRSHead head = rep.getHead();
! HashMap dbCache = (HashMap) head.getSession().getAttribute("IDRS_DB_CACHE");
//retrieve the list of parameter names
--- 325,329 ----
//retrieve the report header
IDRSHead head = rep.getHead();
! HashMap dbCache = (HashMap) session.getAttribute("IDRS_DB_CACHE");
//retrieve the list of parameter names
***************
*** 333,337 ****
for (int i = 0; i < Params.length; i++) {
param = (String) Params[i];
!
//determine what area of the header "db" is being added to
db = param.substring(0, param.indexOf("_"));
--- 333,337 ----
for (int i = 0; i < Params.length; i++) {
param = (String) Params[i];
!
//determine what area of the header "db" is being added to
db = param.substring(0, param.indexOf("_"));
***************
*** 345,365 ****
! if (param.indexOf("Reset") != -1) {
! try {
! if (req.getParameter(param).equalsIgnoreCase("true"))
! dbCache.remove(db);
! }
! catch (Exception ignore){}
! }
!
! else if (param.indexOf("PageSize") != -1) {
! head.setPageSize(db,Integer.parseInt((String) req.getParameter(param)));
! }
! else if (param.indexOf("FirstRecord") != -1) {
! head.setPageFirst(db,Integer.parseInt((String) req.getParameter(param)));
! }
! if (param.indexOf("UserID") != -1) {
System.out.println("HERE");
head.add(db, "", "UserID");
--- 345,367 ----
! if (param.indexOf("Reset") != -1) {
! try {
! if (req.getParameter(param).equalsIgnoreCase("true") && dbCache != null)
! dbCache.remove(db);
! }
! catch (Exception ignore){
! ignore.printStackTrace(System.out);
! }
! }
!
! else if (param.indexOf("PageSize") != -1) {
! head.setPageSize(db,Integer.parseInt((String) req.getParameter(param)));
! }
! else if (param.indexOf("FirstRecord") != -1) {
! head.setPageFirst(db,Integer.parseInt((String) req.getParameter(param)));
! }
! else if (param.indexOf("UserID") != -1) {
System.out.println("HERE");
head.add(db, "", "UserID");
***************
*** 498,503 ****
//initialize some information about the report
poolInfo.docName = docName;
//add the parameters
! addVars(secure, rap, rep);
//lets run the page
--- 500,506 ----
//initialize some information about the report
poolInfo.docName = docName;
+ poolInfo.rep = rep;
//add the parameters
! addVars(secure, rap, rep,req.getSession());
//lets run the page
Index: Init.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/Init.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Init.java 22 Aug 2002 20:06:34 -0000 1.8
--- Init.java 16 Sep 2002 15:19:42 -0000 1.9
***************
*** 93,97 ****
*/
public JDBCInfo getAppDBInfo() {
! return (JDBCInfo) dbs.get(authDB);
}
--- 93,97 ----
*/
public JDBCInfo getAppDBInfo() {
! return ((DbPool) dbs.get(docsDB)).getInfo();
}
|