IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[report] refactor safely

Browse Source 
1. upgrade <report-template> and constructor to top-level
2. convert (args-to-defn) to named-let
This commit is contained in:
Christopher Lam 2019-02-11 23:30:33 +08:00
parent 5f436ae967
commit 0f8558b7f8
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gnucash/report/report-system/report.scm
View File

@ -119,35 +119,16 @@ not found.")))
;; set of options, and generates the report. the renderer must
;; return as its final value an <html-document> object.
(define (blank-report)
((record-constructor <report-template>)
#f ;; version
#f ;; name
#f ;; report-guid
#f ;; parent-type (meaning guid of report-template this template is based on)
#f ;; options-generator
#f ;; options-cleanup-cb
#f ;; options-changed-cb
#f ;; renderer
#t ;; in-menu?
#f ;; menu-path
#f ;; menu-name
#f ;; menu-tip
#f ;; export-types
#f ;; export-thunk
))
(define (args-to-defn)
(let loop ((report-rec (make-report-template)) (args args))
(cond
((null? args) report-rec)
(else
(let ((modifier (record-modifier <report-template> (car args))))
(modifier report-rec (cadr args))
(loop report-rec (cddr args)))))))
(define (args-to-defn in-report-rec args)
(let ((report-rec (or in-report-rec (blank-report))))
(if (null? args)
report-rec
(let ((id (car args))
(value (cadr args))
(remainder (cddr args)))
((record-modifier <report-template> id) report-rec value)
(args-to-defn report-rec remainder)))))
(let ((report-rec (args-to-defn #f args)))
(let ((report-rec (args-to-defn)))
(if (and report-rec
;; only process reports that have a report-guid
(gnc:report-template-report-guid report-rec))
@ -228,6 +209,25 @@ not found.")))
(record-accessor <report-template> 'export-types))
(define gnc:report-template-export-thunk
(record-accessor <report-template> 'export-thunk))
(define (make-report-template)
((record-constructor <report-template>)
#f ;; version
#f ;; name
#f ;; report-guid
#f ;; parent-type (meaning guid of
;; report-template this template is
;; based on)
#f ;; options-generator
#f ;; options-cleanup-cb
#f ;; options-changed-cb
#f ;; renderer
#t ;; in-menu?
#f ;; menu-path
#f ;; menu-name
#f ;; menu-tip
#f ;; export-types
#f ;; export-thunk
))
(define (gnc:report-template-new-options/report-guid template-id template-name)
(let ((templ (hash-ref *gnc:_report-templates_* template-id)))
@ -343,10 +343,12 @@ not found.")))
(define gnc:report-set-custom-template!
(record-modifier <report> 'custom-template))
;; gnc:make-report instantiates a report from a report-template.
;; The actual report is stored away in a hash-table -- only the id is returned.
(define (gnc:make-report template-id . rest)
(let* ((template-parent (gnc:report-template-parent-type (hash-ref *gnc:_report-templates_* template-id)))
(let* ((template-parent (gnc:report-template-parent-type
(hash-ref *gnc:_report-templates_* template-id)))
(report-type (or template-parent template-id))
(custom-template (if template-parent template-id ""))
(r ((record-constructor <report>)
@ -369,10 +371,8 @@ not found.")))
(lambda ()
(gnc:report-set-dirty?! r #t)
(let ((cb (gnc:report-template-options-changed-cb template)))
(if cb
(cb r))))
(if cb (cb r))))
options))
(gnc:report-set-id! r (gnc-report-add r))
(gnc:report-id r)))