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

[standard-reports] reindent/untabify/delete-trailing-whitespace

Browse Source
This commit is contained in:
Christopher Lam 2019-03-02 14:45:19 +08:00
parent d9c8352377
commit 613adfe824
1 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
gnucash/report/standard-reports/standard-reports.scm
View File

@ -61,14 +61,11 @@
(define (gnc:register-report-hook acct-type split? create-fcn) (define (gnc:register-report-hook acct-type split? create-fcn)
(let ((type-info (hash-ref gnc:*register-report-hash* acct-type))) (let ((type-info (hash-ref gnc:*register-report-hash* acct-type)))
(if (not type-info) (if (not type-info)
(set! type-info (make-acct-type))) (set! type-info (make-acct-type)))
(if split? (if split?
(set-split type-info create-fcn) (set-split type-info create-fcn)
(set-non-split type-info create-fcn)) (set-non-split type-info create-fcn))
(hash-set! gnc:*register-report-hash* acct-type type-info))) (hash-set! gnc:*register-report-hash* acct-type type-info)))
(define (lookup-register-report acct-type split) (define (lookup-register-report acct-type split)
@ -78,10 +75,10 @@
(gnc:debug "hash: " gnc:*register-report-hash*) (gnc:debug "hash: " gnc:*register-report-hash*)
(gnc:debug "split: " split) (gnc:debug "split: " split)
(if type-info (if type-info
(if (and split (not (null? split))) (if (and split (not (null? split)))
(begin (gnc:debug "get-split...") (get-split type-info)) (begin (gnc:debug "get-split...") (get-split type-info))
(begin (gnc:debug "get-non-split...") (get-non-split type-info))) (begin (gnc:debug "get-non-split...") (get-non-split type-info)))
#f))) #f)))
;; Returns a list of files in a directory ;; Returns a list of files in a directory
@ -94,30 +91,22 @@
(define (directory-files dir) (define (directory-files dir)
(if (file-exists? dir) (if (file-exists? dir)
(let ((fname-regexp (make-regexp "\\.scm$")) ;; Regexp that matches the desired filenames (let ((fname-regexp (make-regexp "\\.scm$"))
;; Regexp that matches the desired filenames
(dir-stream (opendir dir))) (dir-stream (opendir dir)))
(let loop ((fname (readdir dir-stream))
(let loop ((fname (readdir dir-stream)) (acc '()))
(acc '())) (if (eof-object? fname)
(if (eof-object? fname) (begin
(begin (closedir dir-stream)
(closedir dir-stream) acc)
acc (loop (readdir dir-stream)
) (if (regexp-exec fname-regexp fname)
(loop (readdir dir-stream) (cons fname acc)
(if (regexp-exec fname-regexp fname) acc)))))
(cons fname acc)
acc
)
)
)
))
(begin (begin
(gnc:warn "Can't access " dir ".\nEmpty list will be returned.") (gnc:warn "Can't access " dir ".\nEmpty list will be returned.")
'() ;; return empty list '())))
)
)
)
;; Process a list of files by removing the ".scm" suffix if it exists ;; Process a list of files by removing the ".scm" suffix if it exists
;; ;;
@ -127,19 +116,22 @@
;; Return value: ;; Return value:
;; List of files with .scm suffix removed ;; List of files with .scm suffix removed
(define (process-file-list l) (define (process-file-list l)
(map (lambda (s) (if (string-suffix? ".scm" s) (string-drop-right s 4) s)) (map
l (lambda (s)
) (if (string-suffix? ".scm" s)
) (string-drop-right s 4)
s))
l))
;; Return a list of symbols representing reports in the standard reports directory ;; Return a list of symbols representing reports in the standard reports directory
;; ;;
;; Return value: ;; Return value:
;; List of symbols for reports ;; List of symbols for reports
(define (get-report-list) (define (get-report-list)
(map (lambda (s) (string->symbol s)) (map
(process-file-list (directory-files (gnc-path-get-stdreportsdir)))) (lambda (s)
) (string->symbol s))
(process-file-list (directory-files (gnc-path-get-stdreportsdir)))))
(gnc:debug "stdrpt-dir=" (gnc-path-get-stdreportsdir)) (gnc:debug "stdrpt-dir=" (gnc-path-get-stdreportsdir))
(gnc:debug "dir-files=" (directory-files (gnc-path-get-stdreportsdir))) (gnc:debug "dir-files=" (directory-files (gnc-path-get-stdreportsdir)))
@ -147,22 +139,22 @@
(gnc:debug "report-list=" (get-report-list)) (gnc:debug "report-list=" (get-report-list))
(for-each (for-each
(lambda (x) (lambda (x)
(module-use! (module-use!
(current-module) (current-module)
(resolve-interface (append '(gnucash report standard-reports) (list x))))) (resolve-interface (append '(gnucash report standard-reports) (list x)))))
(get-report-list)) (get-report-list))
(use-modules (gnucash gnc-module)) (use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/engine" 0) (gnc:module-load "gnucash/engine" 0)
(define (gnc:register-report-create account split query journal? ledger-type? (define (gnc:register-report-create account split query journal? ledger-type?
double? title debit-string credit-string) double? title debit-string credit-string)
(let* ((acct-type (xaccAccountGetType account)) (let* ((acct-type (xaccAccountGetType account))
(create-fcn (lookup-register-report acct-type split))) (create-fcn (lookup-register-report acct-type split)))
(gnc:debug "create-fcn: " create-fcn) (gnc:debug "create-fcn: " create-fcn)
(if create-fcn (if create-fcn
(create-fcn account split query journal? double? title (create-fcn account split query journal? double? title
debit-string credit-string) debit-string credit-string)
(gnc:register-report-create-internal #f query journal? ledger-type? double? (gnc:register-report-create-internal #f query journal? ledger-type? double?
title debit-string credit-string)))) title debit-string credit-string))))