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

[business-core] simplify functions

Browse Source
This commit is contained in:
Christopher Lam 2019-07-19 02:24:45 +08:00
parent 57f291af86
commit e654bd34af
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libgnucash/engine/business-core.scm
View File

@ -50,35 +50,25 @@
;
(define (gnc:owner-get-name-dep owner)
(define (just-name name)
(if name name ""))
(let ((type (gncOwnerGetType owner)))
(cond
((eqv? type GNC-OWNER-JOB)
(gnc:owner-get-name-dep (gncJobGetOwner
(gncOwnerGetJob owner))))
(else (just-name (gncOwnerGetName owner))))))
(cond
((eqv? (gncOwnerGetType owner) GNC-OWNER-JOB)
(gnc:owner-get-name-dep (gncJobGetOwner (gncOwnerGetJob owner))))
(else (or (gncOwnerGetName owner) ""))))
(define (gnc:owner-get-address-dep owner)
(define (add-if-exists lst new)
(if (and new (> (string-length new) 0))
(cons new lst)
lst))
(define (build-string lst)
(cond
((null? lst) "")
((null? (cdr lst)) (car lst))
(else (string-append (build-string (cdr lst)) "\n" (car lst)))))
(let ((lst '())
(addr (gnc:owner-get-address owner)))
; Added gncAddressGetName <mikee@saxicola.co.uk>
(set! lst (add-if-exists lst (gncAddressGetName addr)))
(set! lst (add-if-exists lst (gncAddressGetAddr1 addr)))
(set! lst (add-if-exists lst (gncAddressGetAddr2 addr)))
(set! lst (add-if-exists lst (gncAddressGetAddr3 addr)))
(set! lst (add-if-exists lst (gncAddressGetAddr4 addr)))
(build-string lst)))
(define (addif elt)
(if (and elt (> (string-length elt) 0))
(list elt)
'()))
(let ((addr (gnc:owner-get-address owner)))
(string-join
(append
(addif (gncAddressGetName addr))
(addif (gncAddressGetAddr1 addr))
(addif (gncAddressGetAddr2 addr))
(addif (gncAddressGetAddr3 addr))
(addif (gncAddressGetAddr4 addr)))
"\n")))
(define (gnc:owner-get-name-and-address-dep owner)
(let ((name (gnc:owner-get-name-dep owner))