Skip to content

Commit

Permalink
polished to work with Jaspersoft Studio version 6.6.0.final using Jas…
Browse files Browse the repository at this point in the history
…perReports Library version 6.6.0
  • Loading branch information
source-c committed Dec 12, 2018
1 parent b6adce7 commit 4627c99
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
6 changes: 4 additions & 2 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject net.tbt-post/clj-jasper "0.0.2-dev"
(defproject net.tbt-post/clj-jasper "0.0.2"
:description "A Clojure library to work with Jasper Reports"
:url "https://github.com/source-c/clj-jasper"
:license {:name "MIT License"}
Expand All @@ -7,7 +7,9 @@
[net.sf.jasperreports/jasperreports "6.7.0"
:exclusions [com.lowagie/itext]]
[net.sf.jasperreports/jasperreports-fonts "6.0.0"]
[com.lowagie/itext "4.2.2"]
;[com.lowagie/itext "4.2.2"]
[com.lowagie/itext "2.1.7"]
[net.sourceforge.barbecue/barbecue "1.5-beta1"]

;; Loggers
;; -------
Expand Down
15 changes: 9 additions & 6 deletions src/clj_jasper/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@

(def ^:dynamic *jr-templates-path* "reports")

(defn data->report [{:keys [name data mtype filename ops]
(defn template->object [name]
(let [template (some-> (format "%s/%s.jrxml" *jr-templates-path* name)
io/resource
io/file)]
(some-> template io/input-stream JasperCompileManager/compileReport)))

(defn data->report [{:keys [name data mtype filename ops report]
:or {mtype :pdf}}]

(let [template (-> (format "%s/%s.jrxml" *jr-templates-path* name)
io/resource
io/file)
report (-> template io/input-stream JasperCompileManager/compileReport)
(let [report (or report (template->object name))
j-data (data->jr (or data {:empty true}))
filled (JasperFillManager/fillReport
^JasperReport report
Expand All @@ -42,5 +45,5 @@
:pdf (JasperExportManager/exportReportToPdf filled))]

{:name (or filename (format "%s.%s" name (name mtype)))
:type (get mtype mime-types)
:type (get mime-types mtype)
:file bytes}))

0 comments on commit 4627c99

Please sign in to comment.