r14955 - gnucash/branches/swig-redo/src/business - Convert guile code in the business module to use swig conventions.
Chris Shoemaker
chris at cvs.gnucash.org
Mon Oct 9 19:50:43 EDT 2006
Author: chris
Date: 2006-10-09 19:50:41 -0400 (Mon, 09 Oct 2006)
New Revision: 14955
Trac: http://svn.gnucash.org/trac/changeset/14955
Modified:
gnucash/branches/swig-redo/src/business/business-core/business-core.scm
gnucash/branches/swig-redo/src/business/business-reports/business-reports.scm
gnucash/branches/swig-redo/src/business/business-reports/easy-invoice.scm
gnucash/branches/swig-redo/src/business/business-reports/fancy-invoice.scm
gnucash/branches/swig-redo/src/business/business-reports/invoice.scm
gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm
gnucash/branches/swig-redo/src/business/business-utils/business-options.scm
gnucash/branches/swig-redo/src/business/business-utils/business-prefs.scm
Log:
Convert guile code in the business module to use swig conventions.
These conversions were made manually. They involve:
- using '() instead of "" for the the empty object.
- a more direct handling of wrapped enumeration values.
- loading the swig modules instead of the gwrap modules.
Modified: gnucash/branches/swig-redo/src/business/business-core/business-core.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-core/business-core.scm 2006-10-09 23:49:46 UTC (rev 14954)
+++ gnucash/branches/swig-redo/src/business/business-core/business-core.scm 2006-10-09 23:50:41 UTC (rev 14955)
@@ -1,12 +1,11 @@
(define-module (gnucash business-core))
-(use-modules (g-wrapped gw-business-core))
+(use-modules (sw_business_core))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/engine" 0)
(define (gnc:owner-get-address owner)
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type owner) #f)))
- (case type
+ (let ((type (gnc:owner-get-type owner)))
+ (cond
((gnc-owner-customer)
(let ((c (gnc:owner-get-customer owner)))
(gnc:customer-get-addr c)))
@@ -19,7 +18,7 @@
((gnc-owner-job)
(gnc:owner-get-address (gnc:job-get-owner
(gnc:owner-get-job owner))))
- (else ""))))
+ (else '()))))
;
; The -dep functions return combined strings of the appropriate
@@ -36,9 +35,8 @@
(define (just-name name)
(if name name ""))
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type owner) #f)))
- (case type
+ (let ((type (gnc:owner-get-type owner)))
+ (cond
((gnc-owner-job)
(gnc:owner-get-name-dep (gnc:job-get-owner
(gnc:owner-get-job owner))))
@@ -70,9 +68,8 @@
addr)))
(define (gnc:owner-get-owner-id owner)
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type owner) #f)))
- (case type
+ (let ((type (gnc:owner-get-type owner)))
+ (cond
((gnc-owner-customer)
(let ((c (gnc:owner-get-customer owner)))
(gnc:customer-get-id c)))
@@ -87,7 +84,7 @@
(else ""))))
(define (gnc:entry-type-percent-p type-val)
- (let ((type (gw:enum-<gnc:GncAmountType>-val->sym type-val #f)))
+ (let ((type type-val))
(equal? type 'gnc-amount-type-percent)))
(define (gnc:owner-from-split split result-owner)
Modified: gnucash/branches/swig-redo/src/business/business-reports/business-reports.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/business-reports.scm 2006-10-09 23:49:46 UTC (rev 14954)
+++ gnucash/branches/swig-redo/src/business/business-reports/business-reports.scm 2006-10-09 23:50:41 UTC (rev 14955)
@@ -53,9 +53,8 @@
(guid-ref "invoice=" gnc:url-type-invoice (gnc:invoice-get-guid invoice)))
(define (gnc:owner-anchor-text owner)
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type (gnc:owner-get-end-owner owner)) #f)))
- (case type
+ (let ((type (gnc:owner-get-type (gnc:owner-get-end-owner owner))))
+ (cond
((gnc-owner-customer)
(gnc:customer-anchor-text (gnc:owner-get-customer owner)))
@@ -73,11 +72,10 @@
(define (gnc:owner-report-text owner acc)
(let* ((end-owner (gnc:owner-get-end-owner owner))
- (type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type end-owner) #f))
+ (type (gnc:owner-get-type end-owner))
(ref #f))
- (case type
+ (cond
((gnc-owner-customer)
(set! ref "owner=c:"))
Modified: gnucash/branches/swig-redo/src/business/business-reports/easy-invoice.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/easy-invoice.scm 2006-10-09 23:49:46 UTC (rev 14954)
+++ gnucash/branches/swig-redo/src/business/business-reports/easy-invoice.scm 2006-10-09 23:50:41 UTC (rev 14955)
@@ -244,7 +244,7 @@
(gnc:register-inv-option
(gnc:make-invoice-option invoice-page invoice-name "x" ""
- (lambda () #f) #f))
+ (lambda () '()) #f))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
@@ -686,10 +686,9 @@
(if invoice
(begin
(set! owner (gnc:invoice-get-owner invoice))
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type
- (gnc:owner-get-end-owner owner)) #f)))
- (case type
+ (let ((type (gnc:owner-get-type
+ (gnc:owner-get-end-owner owner))))
+ (cond
((gnc-owner-customer)
(set! invoice? #t))
((gnc-owner-vendor)
Modified: gnucash/branches/swig-redo/src/business/business-reports/fancy-invoice.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/fancy-invoice.scm 2006-10-09 23:49:46 UTC (rev 14954)
+++ gnucash/branches/swig-redo/src/business/business-reports/fancy-invoice.scm 2006-10-09 23:50:41 UTC (rev 14955)
@@ -251,7 +251,7 @@
(gnc:register-inv-option
(gnc:make-invoice-option invoice-page invoice-name "x" ""
- (lambda () #f) #f))
+ (lambda () '()) #f))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
@@ -769,10 +769,9 @@
(if invoice
(begin
(set! owner (gnc:invoice-get-owner invoice))
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type
- (gnc:owner-get-end-owner owner)) #f)))
- (case type
+ (let ((type (gnc:owner-get-type
+ (gnc:owner-get-end-owner owner))))
+ (cond
((gnc-owner-customer)
(set! invoice? #t))
((gnc-owner-vendor)
Modified: gnucash/branches/swig-redo/src/business/business-reports/invoice.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/invoice.scm 2006-10-09 23:49:46 UTC (rev 14954)
+++ gnucash/branches/swig-redo/src/business/business-reports/invoice.scm 2006-10-09 23:50:41 UTC (rev 14955)
@@ -237,7 +237,7 @@
(gnc:register-inv-option
(gnc:make-invoice-option invoice-page invoice-name "x" ""
- (lambda () #f) #f))
+ (lambda () '()) #f))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
@@ -639,10 +639,9 @@
(if invoice
(begin
(set! owner (gnc:invoice-get-owner invoice))
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type
- (gnc:owner-get-end-owner owner)) #f)))
- (case type
+ (let ((type (gnc:owner-get-type
+ (gnc:owner-get-end-owner owner))))
+ (cond
((gnc-owner-customer)
(set! invoice? #t))
((gnc-owner-vendor)
Modified: gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm 2006-10-09 23:49:46 UTC (rev 14954)
+++ gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm 2006-10-09 23:50:41 UTC (rev 14955)
@@ -348,7 +348,7 @@
(gnc:register-inv-option
(gnc:make-owner-option owner-page owner-string "v"
(N_ "The company for this report")
- (lambda () #f) #f owner-type))
+ (lambda () '()) #f owner-type))
(gnc:register-inv-option
(gnc:make-internal-option "__reg" "owner-type" owner-type))
@@ -541,10 +541,10 @@
(gnc:date-option-absolute-time
(opt-val gnc:pagename-general (N_ "To")))))
(book (gnc:get-current-book)) ;XXX Grab this from elsewhere
- (owner-type (opt-val "__reg" "owner-type"))
+ (type (opt-val "__reg" "owner-type"))
(type-str ""))
- (case owner-type
+ (cond
((gnc-owner-customer)
(set! type-str (N_ "Customer")))
((gnc-owner-vendor)
@@ -627,8 +627,7 @@
(if (>= index num)
#f
(let* ((this-account (gnc:group-get-account group index))
- (account-type (gw:enum-<gnc:AccountType>-val->sym
- (gnc:account-get-type this-account) #f)))
+ (account-type (gnc:account-get-type this-account)))
(if (eq? account-type type)
this-account
(find-first group num (+ index 1))))))
@@ -641,9 +640,8 @@
#f)))
(define (find-first-account-for-owner owner)
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type (gnc:owner-get-end-owner owner)) #f)))
- (case type
+ (let ((type (gnc:owner-get-type (gnc:owner-get-end-owner owner))))
+ (cond
((gnc-owner-customer)
(find-first-account 'receivable))
@@ -657,7 +655,7 @@
(find-first-account-for-owner (gnc:owner-get-end-owner owner)))
(else
- #f))))
+ #f)))) ;;FIXME: remember to convert
(gnc:define-report
'version 1
@@ -693,9 +691,8 @@
(gnc:make-report report-name options)))
(define (owner-report-create owner account)
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type (gnc:owner-get-end-owner owner)) #f)))
- (case type
+ (let ((type (gnc:owner-get-type (gnc:owner-get-end-owner owner))))
+ (cond
((gnc-owner-customer)
(owner-report-create-internal (N_ "Customer Report") owner account))
Modified: gnucash/branches/swig-redo/src/business/business-utils/business-options.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-utils/business-options.scm 2006-10-09 23:49:46 UTC (rev 14954)
+++ gnucash/branches/swig-redo/src/business/business-utils/business-options.scm 2006-10-09 23:50:41 UTC (rev 14955)
@@ -24,6 +24,8 @@
;; invoice pointers may be used to set the value of the option. The
;; option always returns a single invoice pointer.
+(use-modules (gnucash main))
+
(define (gnc:make-invoice-option
section
name
@@ -282,14 +284,13 @@
(define (convert-to-pair item)
(if (pair? item)
item
- (cons (gw:enum-<gnc:GncOwnerType>-val->sym
- (gnc:owner-get-type item) #f)
+ (cons (gnc:owner-get-type item)
(gnc:owner-get-guid item))))
(define (convert-to-owner pair)
(if (pair? pair)
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym (car pair) #f)))
- (case type
+ (let ((type (car pair)))
+ (cond
((gnc-owner-customer)
(gnc:owner-init-customer
option-value
@@ -314,7 +315,7 @@
(gnc:job-lookup (cdr pair) (gnc:get-current-book)))
option-value)
- (else #f)))
+ (else '())))
pair))
(let* ((option (convert-to-pair (default-getter)))
@@ -330,10 +331,9 @@
(validator
(if (not value-validator)
(lambda (owner)
- (let ((type (gw:enum-<gnc:GncOwnerType>-val->sym
- (if (pair? owner)
- (car owner)
- (gnc:owner-get-type owner)) #f)))
+ (let ((type (if (pair? owner)
+ (car owner)
+ (gnc:owner-get-type owner))))
(if (equal? type owner-type)
(list #t owner)
(list #f "Owner-Type Mismatch"))))
Modified: gnucash/branches/swig-redo/src/business/business-utils/business-prefs.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-utils/business-prefs.scm 2006-10-09 23:49:46 UTC (rev 14954)
+++ gnucash/branches/swig-redo/src/business/business-utils/business-prefs.scm 2006-10-09 23:50:41 UTC (rev 14955)
@@ -68,13 +68,13 @@
(gnc:make-taxtable-option
gnc:*business-label* (N_ "Default Customer TaxTable")
"e" (N_ "The default tax table to apply to customers.")
- (lambda () #f) #f))
+ (lambda () '()) #f))
(reg-option
(gnc:make-taxtable-option
gnc:*business-label* (N_ "Default Vendor TaxTable")
"f" (N_ "The default tax table to apply to vendors.")
- (lambda () #f) #f))
+ (lambda () '()) #f))
(reg-option
(gnc:make-dateformat-option
More information about the gnucash-changes
mailing list