From b414c7c6e162e17bd1afb40a254d09b008302383 Mon Sep 17 00:00:00 2001 From: Patrick Schmitz Date: Thu, 31 Jan 2013 15:01:10 -0800 Subject: [PATCH] CSPACE-5846 Added support to generate reports in MSWord/OpenOffice docx, MSExcel/OO Xlsx, and MSPowerPoint/OO pptx formats. Tweaked the default acquisition report to fix a layering issue that precluded logo image showing up in word and excel outputs. Tested all through services and UI, but no automated testing added. Also added a small tweak to catch unknown mime types, and revert to PDF as a default, with errors in log (but no exception). Deleting the .jasper resource, as we now only want to maintain and install the jrxml. --- .../src/main/resources/acq_basic.jasper | Bin 52595 -> 0 bytes .../src/main/resources/acq_basic.jrxml | 6 +++--- .../services/client/ReportClient.java | 6 ++++++ .../nuxeo/ReportDocumentModelHandler.java | 19 ++++++++++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) delete mode 100644 services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper deleted file mode 100644 index f73c73c5116b2e70bd7a212e1762101908d9975b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52595 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 Kf{R8K^8WzX_g2>c diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml index e6e705583..83109e96b 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml @@ -58,6 +58,9 @@ $P!{where_clause}]]> <band height="102" splitType="Stretch"> + <frame> + <reportElement mode="Opaque" x="0" y="76" width="802" height="14" forecolor="#000000" backcolor="#66FFFF"/> + </frame> <frame> <reportElement mode="Opaque" x="0" y="0" width="797" height="90" backcolor="#FFFFFF"/> <staticText> @@ -72,9 +75,6 @@ $P!{where_clause}]]> <imageExpression><![CDATA["http://www.collectionspace.org/sites/all/themes/CStheme/images/CSpaceLogo.png"]]></imageExpression> </image> </frame> - <frame> - <reportElement mode="Opaque" x="0" y="76" width="802" height="14" forecolor="#000000" backcolor="#66FFFF"/> - </frame> </band> diff --git a/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java b/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java index 82d40bac5..2c0b81184 100644 --- a/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java +++ b/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java @@ -43,6 +43,12 @@ public class ReportClient extends AbstractCommonListPoxServiceClientImpl { exporter = new JRCsvExporter(); exporter.setParameter(JRCsvExporterParameter.FIELD_DELIMITER, "\t"); outputFilename = outputFilename+".csv"; + } else if(outputMimeType.equals(ReportClient.MSWORD_MIME_TYPE) // Understand msword as docx + || outputMimeType.equals(ReportClient.OPEN_DOCX_MIME_TYPE)) { + exporter = new JRDocxExporter(); + outputFilename = outputFilename+".docx"; + } else if(outputMimeType.equals(ReportClient.MSEXCEL_MIME_TYPE) // Understand msexcel as xlsx + || outputMimeType.equals(ReportClient.OPEN_XLSX_MIME_TYPE)) { + exporter = new JRXlsxExporter(); + outputFilename = outputFilename+".xlsx"; + } else if(outputMimeType.equals(ReportClient.MSPPT_MIME_TYPE) // Understand msppt as xlsx + || outputMimeType.equals(ReportClient.OPEN_PPTX_MIME_TYPE)) { + exporter = new JRPptxExporter(); + outputFilename = outputFilename+".pptx"; + } else { + logger.error("Reporting: unsupported output MIME type - defaulting to PDF"); + exporter = new JRPdfExporter(); + outputFilename = outputFilename+"-default-to.pdf"; } // fill the report JasperPrint jasperPrint = JasperFillManager.fillReport(fileStream, params,conn); -- 2.47.3