|
From: Rashmi B. <ra...@us...> - 2005-04-29 15:06:02
|
Update of /cvsroot/pocolap/pocolap/src/com/pocolap/servlets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28195 Modified Files: FormatHelper.java pocOLAPConstants.java Log Message: PDF related changes Index: FormatHelper.java =================================================================== RCS file: /cvsroot/pocolap/pocolap/src/com/pocolap/servlets/FormatHelper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FormatHelper.java 19 Apr 2005 00:39:16 -0000 1.2 --- FormatHelper.java 29 Apr 2005 15:05:51 -0000 1.3 *************** *** 42,46 **** /** ! * FormatHelper implements ServletHelper. It processes requests for ACTION_FORMAT_PDF * * @author Rashmi Banthia --- 42,46 ---- /** ! * FormatHelper implements ServletHelper. It processes requests for ACTION_FORMAT * * @author Rashmi Banthia *************** *** 66,70 **** */ public String processRequest(HttpServletRequest req, HttpServletResponse res) throws ServletException { ! String page = null ; parameters = (HashMap)req.getParameterMap(); String errclass = getClass().getName()+".processRequest(HttpServletRequest,HttpServletResponse): "; --- 66,70 ---- */ public String processRequest(HttpServletRequest req, HttpServletResponse res) throws ServletException { ! String page = null; parameters = (HashMap)req.getParameterMap(); String errclass = getClass().getName()+".processRequest(HttpServletRequest,HttpServletResponse): "; *************** *** 73,80 **** if (action.equalsIgnoreCase(pocOLAPConstants.ACTION_FORMAT)) { ! String fmt = (String)req.getParameter(pocOLAPConstants.ACTION_FORMAT); logger.debug(errclass+"Action = Format Report , Format = " + fmt ); ! ! CrossTabDef currDefinition =(CrossTabDef)req.getSession().getAttribute(pocOLAPConstants.ATTR_SCHEMA); Selector downselector = (Selector)req.getSession().getAttribute(pocOLAPConstants.ACTION_DOWN_START); Selector acrossSelector = (Selector)req.getSession().getAttribute(pocOLAPConstants.ACTION_ACROSS_START); --- 73,81 ---- if (action.equalsIgnoreCase(pocOLAPConstants.ACTION_FORMAT)) { ! ! String fmt = (String)req.getParameter(pocOLAPConstants.ACTION_FORMAT); logger.debug(errclass+"Action = Format Report , Format = " + fmt ); ! ! CrossTabDef currDefinition =(CrossTabDef)req.getSession().getAttribute(pocOLAPConstants.ATTR_SCHEMA); Selector downselector = (Selector)req.getSession().getAttribute(pocOLAPConstants.ACTION_DOWN_START); Selector acrossSelector = (Selector)req.getSession().getAttribute(pocOLAPConstants.ACTION_ACROSS_START); *************** *** 82,89 **** SpreadSheet sheet = (SpreadSheet) req.getSession().getAttribute(pocOLAPConstants.ATTR_SPREADSHEET); ! ByteArrayOutputStream baos = createPDF(currDefinition,downselector,acrossSelector,flist,sheet); req.getSession().setAttribute(pocOLAPConstants.ATTR_BAOS,baos); page = pocOLAPConstants.SERVLET_PDF; } return page ; --- 83,91 ---- SpreadSheet sheet = (SpreadSheet) req.getSession().getAttribute(pocOLAPConstants.ATTR_SPREADSHEET); ! ByteArrayOutputStream baos = createPDF(currDefinition,downselector,acrossSelector,flist,sheet,fmt); req.getSession().setAttribute(pocOLAPConstants.ATTR_BAOS,baos); page = pocOLAPConstants.SERVLET_PDF; + } return page ; *************** *** 95,102 **** Selector across, FilterList[] filterlist , ! SpreadSheet spsheet ){ ! ByteArrayOutputStream baos = new FormatPDF().createPDF(curr,down,across,filterlist,spsheet); return baos ; } --- 97,105 ---- Selector across, FilterList[] filterlist , ! SpreadSheet spsheet , ! String format){ ! ByteArrayOutputStream baos = new FormatPDF().createPDF(curr,down,across,filterlist,spsheet,format); return baos ; } Index: pocOLAPConstants.java =================================================================== RCS file: /cvsroot/pocolap/pocolap/src/com/pocolap/servlets/pocOLAPConstants.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pocOLAPConstants.java 19 Apr 2005 00:39:17 -0000 1.10 --- pocOLAPConstants.java 29 Apr 2005 15:05:52 -0000 1.11 *************** *** 79,84 **** public static final String ACTION_ADMN_REINIT = "admn.reinit"; public static final String ACTION_LOAD_REPT = "load.rept" ; - public static final String ACTION_FORMAT_PDF = "PDF" ; public static final String ACTION_FORMAT = "format" ; /*ATTRs are used for session attribute names*/ --- 79,89 ---- public static final String ACTION_ADMN_REINIT = "admn.reinit"; public static final String ACTION_LOAD_REPT = "load.rept" ; public static final String ACTION_FORMAT = "format" ; + + //PDF Formats + public static final String ACTION_PDF_CONTEMPORARY = "PDF - Contemporary" ; + public static final String ACTION_PDF_HTML = "PDF - Html" ; + public static final String ACTION_PDF_SIMPLEGRID = "PDF - SimpleGrid" ; + public static final String ACTION_PDF_PLAIN = "PDF - Plain" ; /*ATTRs are used for session attribute names*/ |