Tag: cws_dev300_dba31b User: oj Date: 2008-08-13 10:19:04+0000 Modified: dba/reportdesign/java/com/sun/star/report/SDBCReportData.java dba/reportdesign/java/com/sun/star/report/SDBCReportDataFactory.java dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java
Log: #i92409# use escape processing File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/ ====================================================== File [changed]: SDBCReportData.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/SDBCReportData.java?r1=1.6&r2=1.6.32.1 Delta lines: +3 -5 ------------------- --- SDBCReportData.java 2008-06-16 13:01:57+0000 1.6 +++ SDBCReportData.java 2008-08-13 10:19:01+0000 1.6.32.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SDBCReportData.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -85,11 +85,9 @@ final XResultSetMetaData resultSetMetaData = sup.getMetaData(); columnCount = resultSetMetaData.getColumnCount(); - if (parameters != null) - { firstParameterIndex = columnCount + 1; + if (parameters != null) columnCount += parameters.getCount(); - } columnTypes = new int[columnCount]; columnNames = new String[columnCount]; File [changed]: SDBCReportDataFactory.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/SDBCReportDataFactory.java?r1=1.9&r2=1.9.18.1 Delta lines: +25 -22 --------------------- --- SDBCReportDataFactory.java 2008-07-01 07:43:23+0000 1.9 +++ SDBCReportDataFactory.java 2008-08-13 10:19:01+0000 1.9.18.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SDBCReportDataFactory.java,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.18.1 $ * * This file is part of OpenOffice.org. * @@ -72,15 +72,14 @@ { public static final String COMMAND_TYPE = "command-type"; + public static final String ESCAPE_PROCESSING = "escape-processing"; public static final String GROUP_EXPRESSIONS = "group-expressions"; public static final String MASTER_VALUES = "master-values"; public static final String DETAIL_COLUMNS = "detail-columns"; public static final String UNO_FILTER = "Filter"; - private static final String APPLY_FILTER = "ApplyFilter"; private static final String UNO_COMMAND = "Command"; private static final String UNO_ORDER = "Order"; - private static final String UNO_APPLY_FILTER = "ApplyFilter"; private static final String UNO_COMMAND_TYPE = "CommandType"; private final XConnection connection; @@ -435,23 +434,27 @@ if (queries.hasByName(command)) { final XPropertySet prop = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, queries.getByName(command)); - final Boolean escape = (Boolean)prop.getPropertyValue("EscapeProcessing"); - if ( escape.booleanValue() ) + final Boolean escape = (Boolean) prop.getPropertyValue("EscapeProcessing"); + if (escape.booleanValue()) { statement = (String) prop.getPropertyValue(UNO_COMMAND); - final XSingleSelectQueryComposer composer = getComposer(tools,statement,CommandType.COMMAND); - if ( composer != null ) + final XSingleSelectQueryComposer composer = getComposer(tools, statement, CommandType.COMMAND); + if (composer != null) { final String order = (String) prop.getPropertyValue(UNO_ORDER); - if ( order != null && order.length() != 0 ) + if (order != null && order.length() != 0) + { composer.setOrder(order); - final Boolean applyFilter = (Boolean)prop.getPropertyValue(UNO_APPLY_FILTER); - if ( applyFilter.booleanValue() ) + } + final Boolean applyFilter = (Boolean) prop.getPropertyValue(UNO_APPLY_FILTER); + if (applyFilter.booleanValue()) { final String filter = (String) prop.getPropertyValue(UNO_FILTER); - if ( filter != null && filter.length() != 0 ) + if (filter != null && filter.length() != 0) + { composer.setFilter(filter); } + } statement = composer.getQuery(); } } @@ -561,10 +564,10 @@ final XRowSet rowSet = (XRowSet) UnoRuntime.queryInterface(XRowSet.class, m_cmpCtx.getServiceManager().createInstanceWithContext("com.sun.star.sdb.RowSet", m_cmpCtx)); final XPropertySet rowSetProp = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, rowSet); - rowSetProp.setPropertyValue( - "ActiveConnection", connection); - rowSetProp.setPropertyValue(UNO_COMMAND_TYPE, - new Integer(commandType)); + rowSetProp.setPropertyValue("ActiveConnection", connection); + final Boolean escapeProcessing = (Boolean)parameters.get(ESCAPE_PROCESSING); + rowSetProp.setPropertyValue("EscapeProcessing", escapeProcessing); + rowSetProp.setPropertyValue(UNO_COMMAND_TYPE, new Integer(commandType)); rowSetProp.setPropertyValue(UNO_COMMAND, command); final String filter = (String) parameters.get(UNO_FILTER); Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: PentahoReportJob.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java?r1=1.8&r2=1.8.16.1 Delta lines: +4 -2 ------------------- --- PentahoReportJob.java 2008-07-01 07:43:51+0000 1.8 +++ PentahoReportJob.java 2008-08-13 10:19:01+0000 1.8.16.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: PentahoReportJob.java,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.16.1 $ * * This file is part of OpenOffice.org. * @@ -338,8 +338,10 @@ parameters.put(SDBCReportDataFactory.GROUP_EXPRESSIONS, expressions); final String command = (String) officeReport.getAttribute(OfficeNamespaces.OOREPORT_NS, "command"); final String commandType = (String) officeReport.getAttribute(OfficeNamespaces.OOREPORT_NS, SDBCReportDataFactory.COMMAND_TYPE); + final String escapeProcessing = (String) officeReport.getAttribute(OfficeNamespaces.OOREPORT_NS, SDBCReportDataFactory.ESCAPE_PROCESSING); report.setQuery(command); parameters.put(SDBCReportDataFactory.COMMAND_TYPE, commandType); + parameters.put(SDBCReportDataFactory.ESCAPE_PROCESSING,escapeProcessing.equals("true")); final String filter = (String) officeReport.getAttribute(OfficeNamespaces.OOREPORT_NS, "filter"); parameters.put(SDBCReportDataFactory.UNO_FILTER, filter); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
