[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/servlet IDRSServlet.java,1.12,1.13

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv10950/src/net/sourceforge/idrs/core/servlet

Modified Files:
	IDRSServlet.java 
Log Message:
added transaction support and new form handling

Index: IDRSServlet.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IDRSServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** IDRSServlet.java	22 Aug 2002 20:06:33 -0000	1.12
--- IDRSServlet.java	9 Sep 2002 21:27:44 -0000	1.13
***************
*** 325,328 ****
--- 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
***************
*** 343,347 ****
              }
              
!       /*
        if (param.indexOf("Reset") != -1) {
          try {
--- 344,348 ----
              }
              
!       
        if (param.indexOf("Reset") != -1) {
          try {
***************
*** 353,362 ****
         
        else if (param.indexOf("PageSize") != -1) {
!         rep.setPageSize(db,Integer.parseInt((String) req.getParameter(param)));
        }
        else if (param.indexOf("FirstRecord") != -1) {
!         rep.setPageFirst(db,Integer.parseInt((String) req.getParameter(param)));
        }
!        */
              
              if (param.indexOf("UserID") != -1) {
--- 354,363 ----
         
        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) {
***************
*** 510,524 ****
          buffer = rep.buildReport();
         
!     /*    if (! rep.getHead().isError()) {
!             
!         }*/
!         //if we want to send to the client, send it
!         if(rep.getHead().getSendToClient()) {
!             //set the content type
!             resp.setContentType("text/html");
!             resp.getWriter().print(buffer);
!             resp.getWriter().close();
          }
          
      }
      
--- 511,530 ----
          buffer = rep.buildReport();
         
!         if (! rep.getHead().isError()) {
!             //if we want to send to the client, send it
!         	if(rep.getHead().getSendToClient()) {
!          	   //set the content type
!           	  resp.setContentType("text/html");
!            	 resp.getWriter().print(buffer);
!             	resp.getWriter().close();
!         	}
!         }
!         else {
!         	//there was an error in building the page
!         	goBack(req,resp);
          }
          
+         
+         
      }
      
***************
*** 557,561 ****
          resp.setContentType("text/html");
          req.getSession(true).invalidate();
!         req.getRequestDispatcher(init.getDeniedPage()).include(req, resp);
      }
      
--- 563,589 ----
          resp.setContentType("text/html");
          req.getSession(true).invalidate();
!         req.getRequestDispatcher(init.getDeniedPage()).forward(req, resp);
!     }
!     
!     /**
!      * Used to give specified go back page
!      * @param req Request object
!      * @param resp Response object
!      */
!     public void goBack(HttpServletRequest req, HttpServletResponse resp)
!     throws Exception {
!         String goBackPage = req.getParameter("doc_GoBack");
!         
!         //forward to access denied page specified in the doc_GoBack input field
!         if (goBackPage != null) {
! 	        req.setAttribute("doc_Error",req.getAttribute("doc_ERROR"));
! 	        req.removeAttribute("doc_ERROR");
! 	        req.getRequestDispatcher(goBackPage).forward(req, resp);
! 	        
! 	    }
! 	    else {
! 	    	//there is no goback page, so we will throu an exception
! 	    	throw new Exception((String) req.getAttribute("doc_ERROR"));
! 	    }
      }