r14979 - gnucash/branches/swig-redo/src - Automated rename of engine swig-wrapped functions to their swig-names.
Chris Shoemaker
chris at cvs.gnucash.org
Mon Oct 9 20:09:51 EDT 2006
Author: chris
Date: 2006-10-09 20:09:47 -0400 (Mon, 09 Oct 2006)
New Revision: 14979
Trac: http://svn.gnucash.org/trac/changeset/14979
Modified:
gnucash/branches/swig-redo/src/app-utils/app-utils.scm
gnucash/branches/swig-redo/src/app-utils/date-utilities.scm
gnucash/branches/swig-redo/src/app-utils/hooks.scm
gnucash/branches/swig-redo/src/app-utils/options.scm
gnucash/branches/swig-redo/src/business/business-gnome/business-gnome.scm
gnucash/branches/swig-redo/src/business/business-reports/aging.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
gnucash/branches/swig-redo/src/engine/engine-interface.scm
gnucash/branches/swig-redo/src/engine/gnc-numeric.scm
gnucash/branches/swig-redo/src/engine/test/test-create-account.scm
gnucash/branches/swig-redo/src/engine/test/test-scm-query-import.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-dialog-utils.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-file.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-guess-map.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-objects.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-parse.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-acct-table.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-bank-xtn-import.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-format-check.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-invst-xtn-import.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-parse.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/test/test-import-phase-1.scm
gnucash/branches/swig-redo/src/import-export/qif-io-core/test/test-parser.scm
gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf-de_DE.scm
gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf.scm
gnucash/branches/swig-redo/src/report/report-gnome/report-gnome.scm
gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm
gnucash/branches/swig-redo/src/report/report-system/html-acct-table.scm
gnucash/branches/swig-redo/src/report/report-system/html-barchart.scm
gnucash/branches/swig-redo/src/report/report-system/html-piechart.scm
gnucash/branches/swig-redo/src/report/report-system/html-scatter.scm
gnucash/branches/swig-redo/src/report/report-system/html-style-info.scm
gnucash/branches/swig-redo/src/report/report-system/html-style-sheet.scm
gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm
gnucash/branches/swig-redo/src/report/report-system/report-system.scm
gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm
gnucash/branches/swig-redo/src/report/report-system/report.scm
gnucash/branches/swig-redo/src/report/standard-reports/account-piecharts.scm
gnucash/branches/swig-redo/src/report/standard-reports/account-summary.scm
gnucash/branches/swig-redo/src/report/standard-reports/advanced-portfolio.scm
gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm
gnucash/branches/swig-redo/src/report/standard-reports/balance-sheet.scm
gnucash/branches/swig-redo/src/report/standard-reports/budget.scm
gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm
gnucash/branches/swig-redo/src/report/standard-reports/category-barchart.scm
gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm
gnucash/branches/swig-redo/src/report/standard-reports/equity-statement.scm
gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm
gnucash/branches/swig-redo/src/report/standard-reports/income-statement.scm
gnucash/branches/swig-redo/src/report/standard-reports/net-barchart.scm
gnucash/branches/swig-redo/src/report/standard-reports/portfolio.scm
gnucash/branches/swig-redo/src/report/standard-reports/price-scatter.scm
gnucash/branches/swig-redo/src/report/standard-reports/register.scm
gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm
gnucash/branches/swig-redo/src/report/standard-reports/trial-balance.scm
gnucash/branches/swig-redo/src/report/stylesheets/stylesheet-easy.scm
gnucash/branches/swig-redo/src/report/stylesheets/stylesheet-fancy.scm
gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm
gnucash/branches/swig-redo/src/scm/command-line.scm
gnucash/branches/swig-redo/src/scm/main-window.scm
gnucash/branches/swig-redo/src/scm/price-quotes.scm
gnucash/branches/swig-redo/src/tax/us/txf-de_DE.scm
Log:
Automated rename of engine swig-wrapped functions to their swig-names.
s/gnc:query-set-book/qof-query-set-book/g
s/gnc:account-get-commodity/xaccAccountGetCommodity/g
s/gnc:account-set-commodity/xaccAccountSetCommodity/g
s/gnc:transaction-get-currency/xaccTransGetCurrency/g
s/gnc:transaction-set-currency/xaccTransSetCurrency/g
s/'query-and/QOF-QUERY-AND/g
s/'query-or/QOF-QUERY-OR/g
s/'query-compare-equal/QOF-COMPARE-EQUAL/g
s/'\?amt-sgn-match-either/QOF-NUMERIC-MATCH-ANY/g
s/'\?amt-sgn-match-credit/QOF-NUMERIC-MATCH-CREDIT/g
s/'\?amt-sgn-match-debit/QOF-NUMERIC-MATCH-DEBIT/g
s/'\?cleared-match-no/CLEARED-NO/g
s/'\?cleared-match-cleared/CLEARED-CLEARED/g
s/'\?cleared-match-reconciled/CLEARED-RECONCILED/g
s/'\?cleared-match-frozen/CLEARED-FROZEN/g
s/'\?cleared-match-voided/CLEARED-VOIDED/g
s/'guid-match-all/QOF-GUID-MATCH-ALL/g
s/'guid-match-any/QOF-GUID-MATCH-ANY/g
s/'guid-match-none/QOF-GUID-MATCH-NONE/g
s/'query-txn-match-all/QUERY-TXN-MATCH-ALL/g
s/'query-txn-match-any/QUERY-TXN-MATCH-ANY/g
#### Kvp Stuff
s/kvp-type-gint64/KVP-TYPE-GINT64/g
s/kvp-type-double/KVP-TYPE-DOUBLE/g
s/kvp-type-numeric/KVP-TYPE-NUMERIC/g
s/kvp-type-string/KVP-TYPE-STRING/g
s/kvp-type-guid/KVP-TYPE-GUID/g
s/kvp-type-timespec/KVP-TYPE-TIMESPEC/g
s/kvp-type-binary/KVP-TYPE-BINARY/g
s/kvp-type-glist/KVP-TYPE-GLIST/g
s/kvp-type-frame/KVP-TYPE-FRAME/g
s/gnc:kvp-frame-delete-at-path/gnc-kvp-frame-delete-at-path/g
s/gnc:kvp-frame-set-slot-path/kvp-frame-set-slot-path-gslist/g
s/gnc:kvp-frame-get-slot-path/kvp-frame-get-slot-path-gslist/g
s/gnc:book-get-slots/gnc-book-get-slots/g
#### QofIDType Stuff
s/gnc:id-book/QOF-ID-BOOK-SCM/g
s/gnc:query-default-sort/QUERY-DEFAULT-SORT/g
s/gnc:split-lot/SPLIT-LOT/g
s/gnc:split-trans/SPLIT-TRANS/g
s/gnc:split-account /SPLIT-ACCOUNT /g
s/gnc:split-value/SPLIT-VALUE/g
s/gnc:split-memo/SPLIT-MEMO/g
s/gnc:split-date-reconciled/SPLIT-DATE-RECONCILED/g
s/gnc:trans-date-posted/TRANS-DATE-POSTED/g
s/gnc:trans-desc/TRANS-DESCRIPTION/g
s/gnc:trans-num/TRANS-NUM/g
s/gnc:account-code)/ACCOUNT-CODE-)/g
s/gnc:split-account-fullname/SPLIT-ACCT-FULLNAME/g
s/gnc:split-corr-account-fullname/SPLIT-CORR-ACCT-FULLNAME/g
s/gnc:split-corr-account-code/SPLIT-CORR-ACCT-CODE/g
s/gnc:invoice-from-txn/INVOICE-FROM-TXN/g
s/gnc:invoice-owner/INVOICE-OWNER/g
s/gnc:owner-parentg/OWNER-PARENTG/g
s/gnc:owner-from-lot/OWNER-FROM-LOT/g
s/gnc:invoice-from-lot/INVOICE-FROM-LOT/g
s/gnc:query-add-guid-match/qof-query-add-guid-match/g
s/gnc:query-set-sort-order/qof-query-set-sort-order/g
#### Session Stuff
s/gnc:session-new/qof-session-new/g
s/gnc:session-get-book/qof-session-get-book/g
#### Book stuff
s/gnc:book-get-group/xaccGetAccountGroup/g
s/gnc:book-get-template-group/gnc-book-get-template-group/g
s/gnc:book-get-commodity-table/gnc-commodity-table-get-table/g
s/gnc:book-get-pricedb/gnc-pricedb-get-db/g
s/gnc:book-kvp-changed/qof-book-kvp-changed/g
s/gnc:print-date/gnc-print-date/g
s/gnc:commodity-create/gnc-commodity-new/g
s/gnc:commodity-get-exchange-code/gnc-commodity-get-cusip/g
s/gnc:commodity-is-currency?/gnc-commodity-is-currency/g
s/gnc:commodity-equiv?/gnc-commodity-equiv/g
# oops, this gets some unwanted functions, oh well.
s/gnc:commodity-/gnc-commodity-/g
s/gnc:double-to-gnc-numeric/double-to-gnc-numeric/g
s/gnc:numeric-collector/zymurgy/g
s/gnc:numeric-/gnc-numeric-/g
s/zymurgy/gnc:numeric-collector/g
s/gnc:timepair-canonical-day-time/timespecCanonicalDayTime/g
s/gnc:build-dotgnucash-path/gnc-build-dotgnucash-path/g
s/gnc:\*report-hook\*/HOOK-REPORT/g
s/gnc:\*save-options-hook\*/HOOK-SAVE-OPTIONS/g
s/gnc:hook-add-dangler/gnc-hook-add-scm-dangler/g
s/gnc:hook-run-danglers-real/gnc-hook-run/g
#### Price stuff
s/gnc:price-create/gnc-price-create/g
s/gnc:price-get-guid/gncPriceGetGUID/g
s/gnc:price-unref/gnc-price-unref/g
s/gnc:price-set-commodity/gnc-price-set-commodity/g
s/gnc:price-set-currency/gnc-price-set-currency/g
s/gnc:price-set-time/gnc-price-set-time/g
s/gnc:price-set-source/gnc-price-set-source/g
s/gnc:price-set-type/gnc-price-set-type/g
s/gnc:price-set-value/gnc-price-set-value/g
s/gnc:price-get-commodity/gnc-price-get-commodity/g
s/gnc:price-get-currency/gnc-price-get-currency/g
s/gnc:price-get-time/gnc-price-get-time/g
#s/gnc:price-set-source/gnc-price-set-source/g
#s/gnc:price-set-type/gnc-price-set-type/g
s/gnc:price-get-value/gnc-price-get-value/g
s/gnc:price-list-destroy/gnc-price-list-destroy/g
s/gnc:pricedb-/gnc-pricedb-/g
s/gnc:quote-source-set-fq-installed/gnc-quote-source-set-fq-installed/g
Modified: gnucash/branches/swig-redo/src/app-utils/app-utils.scm
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/app-utils.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/app-utils/app-utils.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -125,7 +125,7 @@
(export gnc:config-file-format-version)
;; gw-engine-spec.scm
-(re-export gnc:*save-options-hook*)
+(re-export HOOK-SAVE-OPTIONS)
;; date-utilities.scm
@@ -226,8 +226,8 @@
;; hooks
(export gnc:hook-run-danglers) ;; from hooks.scm
-(re-export gnc:hook-add-dangler)
-(re-export gnc:*report-hook*)
+(re-export gnc-hook-add-scm-dangler)
+(re-export HOOK-REPORT)
;; simple-obj
(export make-simple-class)
Modified: gnucash/branches/swig-redo/src/app-utils/date-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/date-utilities.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/app-utils/date-utilities.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -203,22 +203,22 @@
;; date-granularity comparison functions.
(define (gnc:timepair-earlier-date t1 t2)
- (gnc:timepair-earlier (gnc:timepair-canonical-day-time t1)
- (gnc:timepair-canonical-day-time t2)))
+ (gnc:timepair-earlier (timespecCanonicalDayTime t1)
+ (timespecCanonicalDayTime t2)))
(define (gnc:timepair-later-date t1 t2)
(gnc:timepair-earlier-date t2 t1))
(define (gnc:timepair-le-date t1 t2)
- (gnc:timepair-le (gnc:timepair-canonical-day-time t1)
- (gnc:timepair-canonical-day-time t2)))
+ (gnc:timepair-le (timespecCanonicalDayTime t1)
+ (timespecCanonicalDayTime t2)))
(define (gnc:timepair-ge-date t1 t2)
(gnc:timepair-le t2 t1))
(define (gnc:timepair-eq-date t1 t2)
- (gnc:timepair-eq (gnc:timepair-canonical-day-time t1)
- (gnc:timepair-canonical-day-time t2)))
+ (gnc:timepair-eq (timespecCanonicalDayTime t1)
+ (timespecCanonicalDayTime t2)))
;; Build a list of time intervals.
;;
Modified: gnucash/branches/swig-redo/src/app-utils/hooks.scm
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/hooks.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/app-utils/hooks.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -19,4 +19,4 @@
(if (null? args)
(set! args '())
(set! args (car args)))
- (gnc:hook-run-danglers-real hook args))
+ (gnc-hook-run hook args))
Modified: gnucash/branches/swig-redo/src/app-utils/options.scm
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/options.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/app-utils/options.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -196,9 +196,9 @@
(lambda (x) (set! value x))
(lambda () default-value)
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f value p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f value p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(set! value v))))
(lambda (x)
@@ -220,9 +220,9 @@
(lambda (x) (set! value x))
(lambda () default-value)
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f value p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f value p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(set! value v))))
(lambda (x)
@@ -254,9 +254,9 @@
(lambda (x) (set! value x))
(lambda () default-value)
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f value p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f value p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(set! value v))))
(lambda (x)
@@ -276,12 +276,12 @@
(define (currency->scm currency)
(if (string? currency)
currency
- (gnc:commodity-get-mnemonic currency)))
+ (gnc-commodity-get-mnemonic currency)))
(define (scm->currency currency)
(if (string? currency)
- (gnc:commodity-table-lookup
- (gnc:book-get-commodity-table (gnc-get-current-book))
+ (gnc-commodity-table-lookup
+ (gnc-commodity-table-get-table (gnc-get-current-book))
GNC_COMMODITY_NS_CURRENCY currency)
currency))
@@ -293,9 +293,9 @@
(lambda (x) (set! value (currency->scm x)))
(lambda () (scm->currency default-value))
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f value p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f value p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(set! value v))))
(lambda (x) (list #t x))
@@ -342,9 +342,9 @@
(guid->budget
(gnc:budget-get-default (gnc-get-current-book)))) ;; default-getter
(gnc:restore-form-generator value->string) ;; ??
- (lambda (f p) (gnc:kvp-frame-set-slot-path f value p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f value p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(set! value v))))
(lambda (x) (list #t x)) ;; value-validator
@@ -365,12 +365,12 @@
GNC_COMMODITY_NS_CURRENCY
commodity)
(list 'commodity-scm
- (gnc:commodity-get-namespace commodity)
- (gnc:commodity-get-mnemonic commodity))))
+ (gnc-commodity-get-namespace commodity)
+ (gnc-commodity-get-mnemonic commodity))))
(define (scm->commodity scm)
- (gnc:commodity-table-lookup
- (gnc:book-get-commodity-table (gnc-get-current-book))
+ (gnc-commodity-table-lookup
+ (gnc-commodity-table-get-table (gnc-get-current-book))
(cadr scm) (caddr scm)))
(let* ((value (commodity->scm default-value))
@@ -385,11 +385,11 @@
(lambda () default-value)
(gnc:restore-form-generator value->string)
(lambda (f p)
- (gnc:kvp-frame-set-slot-path f (cadr value) (append p '("ns")))
- (gnc:kvp-frame-set-slot-path f (caddr value) (append p '("monic"))))
+ (kvp-frame-set-slot-path-gslist f (cadr value) (append p '("ns")))
+ (kvp-frame-set-slot-path-gslist f (caddr value) (append p '("monic"))))
(lambda (f p)
- (let ((ns (gnc:kvp-frame-get-slot-path f (append p '("ns"))))
- (monic (gnc:kvp-frame-get-slot-path f (append p '("monic")))))
+ (let ((ns (kvp-frame-get-slot-path-gslist f (append p '("ns"))))
+ (monic (kvp-frame-get-slot-path-gslist f (append p '("monic")))))
(if (and ns monic (string? ns) (string? monic))
(set! value (list 'commodity-scm ns monic)))))
(lambda (x) (list #t x))
@@ -443,9 +443,9 @@
(setter-function-called-cb x)))
(lambda () default-value)
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f value p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f value p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (boolean? v) (not (equal? v default-value)))
(set! value v))))
(lambda (x)
@@ -517,16 +517,16 @@
default-getter
(gnc:restore-form-generator value->string)
(lambda (f p)
- (gnc:kvp-frame-set-slot-path f (symbol->string (car value))
+ (kvp-frame-set-slot-path-gslist f (symbol->string (car value))
(append p '("type")))
- (gnc:kvp-frame-set-slot-path f
+ (kvp-frame-set-slot-path-gslist f
(if (symbol? (cdr value))
(symbol->string (cdr value))
(cdr value))
(append p '("value"))))
(lambda (f p)
- (let ((t (gnc:kvp-frame-get-slot-path f (append p '("type"))))
- (v (gnc:kvp-frame-get-slot-path f (append p '("value")))))
+ (let ((t (kvp-frame-get-slot-path-gslist f (append p '("type"))))
+ (v (kvp-frame-get-slot-path-gslist f (append p '("value")))))
(if (and t v (string? t))
(set! value (cons (string->symbol t)
(if (string? v) (string->symbol v) v))))))
@@ -657,20 +657,20 @@
(define (save-acc list count)
(if (not (null? list))
(let ((key (string-append "acc" (gnc:value->string count))))
- (gnc:kvp-frame-set-slot-path f (car list) (append p (list key)))
+ (kvp-frame-set-slot-path-gslist f (car list) (append p (list key)))
(save-acc (cdr list) (+ 1 count)))))
(if option-set
(begin
- (gnc:kvp-frame-set-slot-path f (length option)
+ (kvp-frame-set-slot-path-gslist f (length option)
(append p '("len")))
(save-acc option 0))))
(lambda (f p)
- (let ((len (gnc:kvp-frame-get-slot-path f (append p '("len")))))
+ (let ((len (kvp-frame-get-slot-path-gslist f (append p '("len")))))
(define (load-acc count)
(if (< count len)
(let* ((key (string-append "acc" (gnc:value->string count)))
- (guid (gnc:kvp-frame-get-slot-path
+ (guid (kvp-frame-get-slot-path-gslist
f (append p (list key)))))
(cons guid (load-acc (+ count 1))))
'()))
@@ -772,9 +772,9 @@
(gnc:error "Illegal account value set"))))
(lambda () (convert-to-account (get-default)))
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f value p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f value p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(set! value v))))
validator
@@ -851,9 +851,9 @@
(gnc:error "Illegal Multichoice option set")))
(lambda () default-value)
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f (symbol->string value) p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f (symbol->string value) p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(set! value (string->symbol v)))))
(lambda (x)
@@ -937,9 +937,9 @@
(gnc:error "Illegal Radiobutton option set")))
(lambda () default-value)
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f (symbol->string value) p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f (symbol->string value) p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(set! value (string->symbol v)))))
(lambda (x)
@@ -1003,16 +1003,16 @@
(define (save-item list count)
(if (not (null? list))
(let ((key (string-append "item" (gnc:value->string count))))
- (gnc:kvp-frame-set-slot-path f (car list) (append p (list key)))
+ (kvp-frame-set-slot-path-gslist f (car list) (append p (list key)))
(save-item (cdr list) (+ 1 count)))))
- (gnc:kvp-frame-set-slot-path f (length value) (append p '("len")))
+ (kvp-frame-set-slot-path-gslist f (length value) (append p '("len")))
(save-item value 0))
(lambda (f p)
- (let ((len (gnc:kvp-frame-get-slot-path f (append p '("len")))))
+ (let ((len (kvp-frame-get-slot-path-gslist f (append p '("len")))))
(define (load-item count)
(if (< count len)
(let* ((key (string-append "item" (gnc:value->string count)))
- (val (gnc:kvp-frame-get-slot-path
+ (val (kvp-frame-get-slot-path-gslist
f (append p (list key)))))
(cons val (load-item (+ count 1))))
'()))
@@ -1051,9 +1051,9 @@
(lambda (x) (set! value x))
(lambda () default-value)
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f (symbol->string value) p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f (symbol->string value) p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (number? v))
(set! value v))))
(lambda (x)
@@ -1211,18 +1211,18 @@
(lambda () (def-value))
(gnc:restore-form-generator value->string)
(lambda (f p)
- (gnc:kvp-frame-set-slot-path
+ (kvp-frame-set-slot-path-gslist
f (symbol->string (car value)) (append p '("fmt")))
- (gnc:kvp-frame-set-slot-path
+ (kvp-frame-set-slot-path-gslist
f (symbol->string (cadr value)) (append p '("month")))
- (gnc:kvp-frame-set-slot-path
+ (kvp-frame-set-slot-path-gslist
f (if (caddr value) 1 0) (append p '("years")))
- (gnc:kvp-frame-set-slot-path f (cadddr value) (append p '("custom"))))
+ (kvp-frame-set-slot-path-gslist f (cadddr value) (append p '("custom"))))
(lambda (f p)
- (let ((fmt (gnc:kvp-frame-get-slot-path f (append p '("fmt"))))
- (month (gnc:kvp-frame-get-slot-path f (append p '("month"))))
- (years (gnc:kvp-frame-get-slot-path f (append p '("years"))))
- (custom (gnc:kvp-frame-get-slot-path f (append p '("custom")))))
+ (let ((fmt (kvp-frame-get-slot-path-gslist f (append p '("fmt"))))
+ (month (kvp-frame-get-slot-path-gslist f (append p '("month"))))
+ (years (kvp-frame-get-slot-path-gslist f (append p '("years"))))
+ (custom (kvp-frame-get-slot-path-gslist f (append p '("custom")))))
(if (and
fmt (string? fmt)
month (string? month)
@@ -1468,7 +1468,7 @@
(define (gnc:options-scm->kvp options kvp-frame key-path clear-kvp?)
(if clear-kvp?
- (gnc:kvp-frame-delete-at-path kvp-frame key-path))
+ (gnc-kvp-frame-delete-at-path kvp-frame key-path))
((options 'scm->kvp) kvp-frame key-path))
(define (gnc:options-kvp->scm options kvp-frame key-path)
Modified: gnucash/branches/swig-redo/src/business/business-gnome/business-gnome.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-gnome/business-gnome.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/business/business-gnome/business-gnome.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -25,4 +25,4 @@
(gnc:make-menu gnc:menuname-business-reports
(list gnc:menuname-reports))))
-(gnc:hook-add-dangler gnc:*report-hook* business-report-function)
+(gnc-hook-add-scm-dangler HOOK-REPORT business-report-function)
Modified: gnucash/branches/swig-redo/src/business/business-reports/aging.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/aging.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/business/business-reports/aging.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -67,13 +67,13 @@
(define num-buckets 4)
(define (new-bucket-vector)
- (make-vector num-buckets (gnc:numeric-zero)))
+ (make-vector num-buckets (gnc-numeric-zero)))
(define make-company-private
(record-constructor company-info '(currency bucket-vector overpayment owner-obj)))
(define (make-company currency owner-obj)
- (make-company-private currency (new-bucket-vector) (gnc:numeric-zero) owner-obj))
+ (make-company-private currency (new-bucket-vector) (gnc-numeric-zero) owner-obj))
(define company-get-currency
(record-accessor company-info 'currency))
@@ -116,11 +116,11 @@
(find-bucket (+ current-bucket 1) bucket-intervals date)))))
(define (calculate-adjusted-values amount overpayment)
- (if (>= (gnc:numeric-compare amount overpayment) 0)
- (cons (gnc:numeric-sub-fixed amount overpayment)
- (gnc:numeric-zero))
- (cons (gnc:numeric-zero)
- (gnc:numeric-sub-fixed overpayment amount))))
+ (if (>= (gnc-numeric-compare amount overpayment) 0)
+ (cons (gnc-numeric-sub-fixed amount overpayment)
+ (gnc-numeric-zero))
+ (cons (gnc-numeric-zero)
+ (gnc-numeric-sub-fixed overpayment amount))))
(let* ((current-overpayment (company-get-overpayment company))
(adjusted-values (calculate-adjusted-values amount current-overpayment))
@@ -129,7 +129,7 @@
(bucket-index (find-bucket 0 bucket-intervals date))
(buckets (company-get-buckets company))
(new-bucket-value
- (gnc:numeric-add-fixed adjusted-amount (vector-ref buckets bucket-index))))
+ (gnc-numeric-add-fixed adjusted-amount (vector-ref buckets bucket-index))))
(vector-set! buckets bucket-index new-bucket-value)
(company-set-buckets company buckets)
(company-set-overpayment company adjusted-overpayment)))
@@ -144,15 +144,15 @@
(if (>= current-bucket-index (vector-length buckets))
amount
(let ((current-bucket-amt (vector-ref buckets current-bucket-index)))
- (if (>= (gnc:numeric-compare current-bucket-amt amount) 0)
+ (if (>= (gnc-numeric-compare current-bucket-amt amount) 0)
(begin
- (vector-set! buckets current-bucket-index (gnc:numeric-sub-fixed
+ (vector-set! buckets current-bucket-index (gnc-numeric-sub-fixed
current-bucket-amt amount))
- (gnc:numeric-zero))
+ (gnc-numeric-zero))
(begin
- (vector-set! buckets current-bucket-index (gnc:numeric-zero))
+ (vector-set! buckets current-bucket-index (gnc-numeric-zero))
(process-payment-driver
- (gnc:numeric-sub-fixed amount current-bucket-amt)
+ (gnc-numeric-sub-fixed amount current-bucket-amt)
buckets
(+ current-bucket-index 1)))))))
@@ -161,8 +161,8 @@
(gnc:debug "processing payment of " amount)
(gnc:debug "overpayment was " overpayment)
- (if (gnc:numeric-positive-p overpayment)
- (company-set-overpayment company (gnc:numeric-add-fixed overpayment amount))
+ (if (gnc-numeric-positive-p overpayment)
+ (company-set-overpayment company (gnc-numeric-add-fixed overpayment amount))
(let ((result (process-payment-driver amount (company-get-buckets company) 0)))
(gnc:debug "payment-driver processed. new overpayment: " result)
@@ -186,20 +186,20 @@
(if
owner
(let* ((guid (gncOwnerReturnGUID owner))
- (this-currency (gnc:transaction-get-currency transaction))
+ (this-currency (xaccTransGetCurrency transaction))
(this-date (gnc:transaction-get-date-posted transaction))
(company-info (hash-ref hash guid)))
(gnc:debug "update-company-hash called")
(gnc:debug "owner: " owner ", guid: " guid)
(gnc:debug "split-value: " value)
- (if reverse? (set! value (gnc:numeric-neg value)))
+ (if reverse? (set! value (gnc-numeric-neg value)))
(if company-info
;; if it's an existing company, destroy the temp owner and
;; then make sure the currencies match
(begin
(gncOwnerDestroy temp-owner)
- (if (not (gnc:commodity-equiv?
+ (if (not (gnc-commodity-equiv
this-currency
(company-get-currency company-info)))
(cons #f (sprintf
@@ -207,8 +207,8 @@
more than one currency. This report is not designed to cope with this possibility.") (gncOwnerGetName owner)))
(begin
(gnc:debug "it's an old company")
- (if (gnc:numeric-negative-p value)
- (process-invoice company-info (gnc:numeric-neg value) bucket-intervals this-date)
+ (if (gnc-numeric-negative-p value)
+ (process-invoice company-info (gnc-numeric-neg value) bucket-intervals this-date)
(process-payment company-info value))
(hash-set! hash guid company-info)
(cons #t guid))))
@@ -217,8 +217,8 @@
(begin
(gnc:debug "value" value)
(let ((new-company (make-company this-currency owner)))
- (if (gnc:numeric-negative-p value)
- (process-invoice new-company (gnc:numeric-neg value) bucket-intervals this-date)
+ (if (gnc-numeric-negative-p value)
+ (process-invoice new-company (gnc-numeric-neg value) bucket-intervals this-date)
(process-payment new-company value))
(hash-set! hash guid new-company))
(cons #t guid))))
@@ -240,11 +240,11 @@
;; get the total debt from the buckets
(define (buckets-get-total buckets)
- (let ((running-total (gnc:numeric-zero))
+ (let ((running-total (gnc-numeric-zero))
(buckets-list (vector->list buckets)))
(for-each (lambda (bucket)
(set! running-total
- (gnc:numeric-add-fixed bucket running-total)))
+ (gnc-numeric-add-fixed bucket running-total)))
buckets-list)
running-total))
@@ -258,7 +258,7 @@
(bucket-b (company-get-buckets company-b))
(total-a (buckets-get-total bucket-a))
(total-b (buckets-get-total bucket-b))
- (difference-sign (gnc:numeric-compare (gnc:numeric-sub-fixed total-a total-b) (gnc:numeric-zero))))
+ (difference-sign (gnc-numeric-compare (gnc-numeric-sub-fixed total-a total-b) (gnc-numeric-zero))))
;; if same totals, compare by name
(if (= difference-sign 0)
(gnc:safe-strcmp (car litem-a) (car litem-b))
@@ -270,11 +270,11 @@
(define (driver buckets-a buckets-b)
(if (null? buckets-a)
0
- (let ((diff (gnc:numeric-compare
- (gnc:numeric-sub-fixed
+ (let ((diff (gnc-numeric-compare
+ (gnc-numeric-sub-fixed
(car buckets-a)
(car buckets-b))
- (gnc:numeric-zero))))
+ (gnc-numeric-zero))))
(if (= diff 0)
(driver (cdr buckets-a) (cdr buckets-b))
diff))))
@@ -304,12 +304,12 @@
(set! begindate (decdate begindate NinetyDayDelta)) ;XXX - 360 days!?!
(gnc:debug "begindate" begindate)
(gnc:debug "date" date)
- (gnc:query-set-book query (gnc-get-current-book))
+ (qof-query-set-book query (gnc-get-current-book))
(gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
- (gnc:query-add-single-account-match query account 'query-and)
- (gnc:query-add-date-match-timepair query #t begindate #t date 'query-and)
- (gnc:query-set-sort-order query
- (list gnc:split-trans gnc:trans-date-posted)
+ (gnc:query-add-single-account-match query account QOF-QUERY-AND)
+ (gnc:query-add-date-match-timepair query #t begindate #t date QOF-QUERY-AND)
+ (qof-query-set-sort-order query
+ (list SPLIT-TRANS TRANS-DATE-POSTED)
'() '())
(gnc:query-set-sort-increasing query #t #t #t)))
@@ -472,12 +472,12 @@
;; convert the buckets in the header data structure
(define (convert-to-monetary-list bucket-list currency overpayment)
- (let* ((running-total (gnc:numeric-neg overpayment))
+ (let* ((running-total (gnc-numeric-neg overpayment))
(monetised-buckets
(map (lambda (bucket-list-entry)
(begin
(set! running-total
- (gnc:numeric-add-fixed running-total bucket-list-entry))
+ (gnc-numeric-add-fixed running-total bucket-list-entry))
(gnc:make-gnc-monetary currency bucket-list-entry)))
(vector->list bucket-list))))
(append (reverse monetised-buckets)
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-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/business/business-reports/easy-invoice.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -142,7 +142,7 @@
(val (cdr item))
(ref (hash-ref hash acct)))
- (hash-set! hash acct (if ref (gnc:numeric-add-fixed ref val) val))))
+ (hash-set! hash acct (if ref (gnc-numeric-add-fixed ref val) val))))
values))
@@ -174,7 +174,7 @@
(if (date-col column-vector)
(addto! row-contents
- (gnc:print-date (gncEntryGetDate entry))))
+ (gnc-print-date (gncEntryGetDate entry))))
(if (description-col column-vector)
(addto! row-contents
@@ -391,7 +391,7 @@
monetary
(let ((amt (gnc:gnc-monetary-amount monetary)))
(if amt
- (if (gnc:numeric-negative-p amt)
+ (if (gnc-numeric-negative-p amt)
(gnc:monetary-neg monetary)
monetary)
monetary))))
@@ -416,7 +416,7 @@
(define (add-payment-row table used-columns split total-collector)
(let* ((t (gnc:split-get-parent split))
- (currency (gnc:transaction-get-currency t))
+ (currency (xaccTransGetCurrency t))
;; XXX Need to know when to reverse the value
(amt (gnc:make-gnc-monetary currency (gnc:split-get-value split)))
(payment-style "grand-total")
@@ -428,7 +428,7 @@
(if (date-col used-columns)
(addto! row
- (gnc:print-date (gnc:transaction-get-date-posted t))))
+ (gnc-print-date (gnc:transaction-get-date-posted t))))
(if (description-col used-columns)
(addto! row (_ "Payment, thank you")))
@@ -462,7 +462,7 @@
(hash-for-each
(lambda (acct value)
(let ((collector (gnc:make-commodity-collector))
- (commodity (gnc:account-get-commodity acct))
+ (commodity (xaccAccountGetCommodity acct))
(name (gnc:account-get-name acct)))
(collector 'add commodity value)
(add-subtotal-row table used-columns collector
@@ -609,7 +609,7 @@
table
(list
(string-append label ": ")
- (string-expand (gnc:print-date date) #\space " "))))
+ (string-expand (gnc-print-date date) #\space " "))))
(define (make-date-table)
(let ((table (gnc:make-html-table)))
@@ -624,11 +624,11 @@
(define (make-myname-table book)
(let* ((table (gnc:make-html-table))
- (slots (gnc:book-get-slots book))
- (name (gnc:kvp-frame-get-slot-path
+ (slots (gnc-book-get-slots book))
+ (name (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-name*))))
- (addy (gnc:kvp-frame-get-slot-path
+ (addy (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-addy*)))))
@@ -720,8 +720,8 @@
(if (opt-val "Display" "My Company ID")
(let* ((book (gncInvoiceGetBook invoice))
- (slots (gnc:book-get-slots book))
- (taxid (gnc:kvp-frame-get-slot-path
+ (slots (gnc-book-get-slots book))
+ (taxid (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-id*)))))
(if (and taxid (> (string-length taxid) 0))
@@ -768,7 +768,7 @@
(add-html! document "Date: ")
(add-html! document "</td>")
(add-html! document "<td>")
- (add-html! document (gnc:print-date post-date))
+ (add-html! document (gnc-print-date post-date))
(add-html! document "</td>")
(if (opt-val "Display" "Due Date")
(begin
@@ -776,7 +776,7 @@
(add-html! document "Due: ")
(add-html! document "</td>")
(add-html! document "<td>")
- (add-html! document (gnc:print-date due-date))
+ (add-html! document (gnc-print-date due-date))
(add-html! document "</td>")))
(add-html! document "</tr></table>"))
(add-html! document
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-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/business/business-reports/fancy-invoice.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -160,7 +160,7 @@
(val (cdr item))
(ref (hash-ref hash acct)))
- (hash-set! hash acct (if ref (gnc:numeric-add-fixed ref val) val))))
+ (hash-set! hash acct (if ref (gnc-numeric-add-fixed ref val) val))))
values))
(define (monetary-or-percent numeric currency entry-type)
@@ -180,7 +180,7 @@
(if (date-col column-vector)
(addto! row-contents
- (gnc:print-date (gncEntryGetDate entry))))
+ (gnc-print-date (gncEntryGetDate entry))))
(if (description-col column-vector)
(addto! row-contents
@@ -405,7 +405,7 @@
monetary
(let ((amt (gnc:gnc-monetary-amount monetary)))
(if amt
- (if (gnc:numeric-negative-p amt)
+ (if (gnc-numeric-negative-p amt)
(gnc:monetary-neg monetary)
monetary)
monetary))))
@@ -433,7 +433,7 @@
(define (add-payment-row table used-columns split total-collector)
(let* ((t (gnc:split-get-parent split))
- (currency (gnc:transaction-get-currency t))
+ (currency (xaccTransGetCurrency t))
;; XXX Need to know when to reverse the value
(amt (gnc:make-gnc-monetary currency (gnc:split-get-value split)))
(payment-style "grand-total")
@@ -445,7 +445,7 @@
(if (date-col used-columns)
(addto! row
- (gnc:print-date (gnc:transaction-get-date-posted t))))
+ (gnc-print-date (gnc:transaction-get-date-posted t))))
(if (description-col used-columns)
(addto! row (_ "Payment, thank you")))
@@ -488,7 +488,7 @@
(hash-for-each
(lambda (acct value)
(let ((collector (gnc:make-commodity-collector))
- (commodity (gnc:account-get-commodity acct))
+ (commodity (xaccAccountGetCommodity acct))
(name (gnc:account-get-name acct)))
(collector 'add commodity value)
(add-subtotal-row table used-columns collector
@@ -649,7 +649,7 @@
;; for the invoice date/due date fields
;; I could have taken the format from the report options, but... ;)
(string-expand (strftime "%B %e, %Y" (localtime (car date))) #\space " ")
- ;;(string-expand (gnc:print-date date) #\space " ")
+ ;;(string-expand (gnc-print-date date) #\space " ")
)))
(define (make-date-table)
@@ -665,26 +665,26 @@
(define (make-myname-table book date-format)
(let* ((table (gnc:make-html-table))
- (slots (gnc:book-get-slots book))
- (name (gnc:kvp-frame-get-slot-path
+ (slots (gnc-book-get-slots book))
+ (name (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-name*))))
-;; (contact (gnc:kvp-frame-get-slot-path
+;; (contact (kvp-frame-get-slot-path-gslist
;; slots (append gnc:*kvp-option-path*
;; (list gnc:*business-label* gnc:*company-contact*))))
- (addy (gnc:kvp-frame-get-slot-path
+ (addy (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-addy*))))
- (id (gnc:kvp-frame-get-slot-path
+ (id (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-id*))))
- (phone (gnc:kvp-frame-get-slot-path
+ (phone (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-phone*))))
- (fax (gnc:kvp-frame-get-slot-path
+ (fax (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-fax*))))
- (url (gnc:kvp-frame-get-slot-path
+ (url (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-url*))))
(invoice-cell (gnc:make-html-table-cell))
@@ -786,7 +786,7 @@
(if invoice
(let* ((book (gncInvoiceGetBook invoice))
- (slots (gnc:book-get-slots book))
+ (slots (gnc-book-get-slots book))
(date-object #f)
(helper-table (gnc:make-html-table)))
(set! table (make-entry-table invoice
@@ -914,7 +914,7 @@
(make-break! document)
(if (opt-val "Display" "Payable to")
- (let* ((name (gnc:kvp-frame-get-slot-path
+ (let* ((name (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label*
gnc:*company-name*))))
@@ -929,7 +929,7 @@
(make-break! document)
(if (opt-val "Display" "Company contact")
- (let* ((contact (gnc:kvp-frame-get-slot-path
+ (let* ((contact (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label*
gnc:*company-contact*))))
Modified: gnucash/branches/swig-redo/src/business/business-reports/invoice.scm
===================================================================
--- gnucash/branches/swig-redo/src/business/business-reports/invoice.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/business/business-reports/invoice.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -136,7 +136,7 @@
(val (cdr item))
(ref (hash-ref hash acct)))
- (hash-set! hash acct (if ref (gnc:numeric-add-fixed ref val) val))))
+ (hash-set! hash acct (if ref (gnc-numeric-add-fixed ref val) val))))
values))
@@ -168,7 +168,7 @@
(if (date-col column-vector)
(addto! row-contents
- (gnc:print-date (gncEntryGetDate entry))))
+ (gnc-print-date (gncEntryGetDate entry))))
(if (description-col column-vector)
(addto! row-contents
@@ -357,7 +357,7 @@
monetary
(let ((amt (gnc:gnc-monetary-amount monetary)))
(if amt
- (if (gnc:numeric-negative-p amt)
+ (if (gnc-numeric-negative-p amt)
(gnc:monetary-neg monetary)
monetary)
monetary))))
@@ -382,7 +382,7 @@
(define (add-payment-row table used-columns split total-collector)
(let* ((t (gnc:split-get-parent split))
- (currency (gnc:transaction-get-currency t))
+ (currency (xaccTransGetCurrency t))
;; XXX Need to know when to reverse the value
(amt (gnc:make-gnc-monetary currency (gnc:split-get-value split)))
(payment-style "grand-total")
@@ -394,7 +394,7 @@
(if (date-col used-columns)
(addto! row
- (gnc:print-date (gnc:transaction-get-date-posted t))))
+ (gnc-print-date (gnc:transaction-get-date-posted t))))
(if (description-col used-columns)
(addto! row (_ "Payment, thank you")))
@@ -426,7 +426,7 @@
(hash-for-each
(lambda (acct value)
(let ((collector (gnc:make-commodity-collector))
- (commodity (gnc:account-get-commodity acct))
+ (commodity (xaccAccountGetCommodity acct))
(name (gnc:account-get-name acct)))
(collector 'add commodity value)
(add-subtotal-row table used-columns collector
@@ -572,7 +572,7 @@
table
(list
(string-append label ": ")
- (string-expand (gnc:print-date date) #\space " "))))
+ (string-expand (gnc-print-date date) #\space " "))))
(define (make-date-table)
(let ((table (gnc:make-html-table)))
@@ -587,11 +587,11 @@
(define (make-myname-table book date-format)
(let* ((table (gnc:make-html-table))
- (slots (gnc:book-get-slots book))
- (name (gnc:kvp-frame-get-slot-path
+ (slots (gnc-book-get-slots book))
+ (name (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-name*))))
- (addy (gnc:kvp-frame-get-slot-path
+ (addy (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-addy*)))))
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-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -115,7 +115,7 @@
(define num-buckets 4)
(define (new-bucket-vector)
- (make-vector num-buckets (gnc:numeric-zero)))
+ (make-vector num-buckets (gnc-numeric-zero)))
(define (make-interval-list to-date)
(let ((begindate to-date))
@@ -126,9 +126,9 @@
(define (make-aging-table options query bucket-intervals reverse?)
- (let ((lots (gnc:query-get-lots query 'query-txn-match-any))
+ (let ((lots (gnc:query-get-lots query QUERY-TXN-MATCH-ANY))
(buckets (new-bucket-vector))
- (payments (gnc:numeric-zero))
+ (payments (gnc-numeric-zero))
(currency (gnc-default-currency)) ;XXX
(table (gnc:make-html-table)))
@@ -145,13 +145,13 @@
(define (apply-invoice date value)
(let* ((bucket-index (find-bucket 0 bucket-intervals date))
- (new-value (gnc:numeric-add-fixed
+ (new-value (gnc-numeric-add-fixed
value
(vector-ref buckets bucket-index))))
(vector-set! buckets bucket-index new-value)))
(define (apply-payment value)
- (set! payments (gnc:numeric-add-fixed value payments)))
+ (set! payments (gnc-numeric-add-fixed value payments)))
(for-each
(lambda (lot)
@@ -159,10 +159,10 @@
(invoice (gncInvoiceGetInvoiceFromLot lot))
(post-date (gncInvoiceGetDatePosted invoice)))
- (if (not (gnc:numeric-zero-p bal))
+ (if (not (gnc-numeric-zero-p bal))
(begin
(if reverse?
- (set! bal (gnc:numeric-neg bal)))
+ (set! bal (gnc-numeric-neg bal)))
(if invoice
(begin
(apply-invoice post-date bal))
@@ -198,7 +198,7 @@
(value (gnc:transaction-get-account-value txn acc))
(split (gnc:transaction-get-split txn 0))
(invoice (gncInvoiceGetInvoiceFromTxn txn))
- (currency (gnc:transaction-get-currency txn))
+ (currency (xaccTransGetCurrency txn))
(type-str
(cond
((equal? type gnc:transaction-type-invoice)
@@ -215,12 +215,12 @@
(define (make-row date due-date num type-str memo value)
(let ((row-contents '()))
(if (date-col column-vector)
- (addto! row-contents (gnc:print-date date)))
+ (addto! row-contents (gnc-print-date date)))
(if (date-due-col column-vector)
(addto! row-contents
(if (and due-date
(not (equal? due-date (cons 0 0))))
- (gnc:print-date due-date)
+ (gnc-print-date due-date)
"")))
(if (num-col column-vector)
(addto! row-contents num))
@@ -236,7 +236,7 @@
row-contents))
(if reverse?
- (set! value (gnc:numeric-neg value)))
+ (set! value (gnc-numeric-neg value)))
(if (gnc:timepair-later start-date date)
(begin
@@ -245,7 +245,7 @@
(if (not printed?)
(begin
(set! printed? #t)
- (if (not (gnc:numeric-zero-p total))
+ (if (not (gnc-numeric-zero-p total))
(let ((row (make-row start-date #f "" (_ "Balance") "" total))
(row-style (if odd-row? "normal-row" "alternate-row")))
(gnc:html-table-append-row/markup! table row-style
@@ -273,9 +273,9 @@
(define (make-txn-table options query acc start-date end-date)
- (let ((txns (gnc:query-get-transactions query 'query-txn-match-any))
+ (let ((txns (gnc:query-get-transactions query QUERY-TXN-MATCH-ANY))
(used-columns (build-column-used options))
- (total (gnc:numeric-zero))
+ (total (gnc-numeric-zero))
(currency (gnc-default-currency)) ;XXX
(table (gnc:make-html-table))
(inv-str (gnc:option-value (gnc:lookup-option options "__reg"
@@ -302,7 +302,7 @@
inv-str reverse? start-date total)))
(set! printed? (car result))
- (set! total (gnc:numeric-add-fixed total (cadr result)))
+ (set! total (gnc-numeric-add-fixed total (cadr result)))
(set! odd-row? (caddr result))
))))
txns))
@@ -312,7 +312,7 @@
"grand-total"
(append (cons (gnc:make-html-table-cell/markup
"total-label-cell"
- (if (gnc:numeric-negative-p total)
+ (if (gnc-numeric-negative-p total)
(_ "Total Credit")
(_ "Total Due")))
'())
@@ -435,24 +435,24 @@
(define (setup-query q owner account end-date)
(let* ((guid (gncOwnerReturnGUID (gncOwnerGetEndOwner owner))))
- (gnc:query-add-guid-match
+ (qof-query-add-guid-match
q
- (list gnc:split-trans gnc:invoice-from-txn gnc:invoice-owner
- gnc:owner-parentg)
- guid 'query-or)
- (gnc:query-add-guid-match
+ (list SPLIT-TRANS INVOICE-FROM-TXN INVOICE-OWNER
+ OWNER-PARENTG)
+ guid QOF-QUERY-OR)
+ (qof-query-add-guid-match
q
- (list gnc:split-lot gnc:owner-from-lot gnc:owner-parentg)
- guid 'query-or)
- (gnc:query-add-guid-match
+ (list SPLIT-LOT OWNER-FROM-LOT OWNER-PARENTG)
+ guid QOF-QUERY-OR)
+ (qof-query-add-guid-match
q
- (list gnc:split-lot gnc:invoice-from-lot gnc:invoice-owner
- gnc:owner-parentg)
- guid 'query-or)
+ (list SPLIT-LOT INVOICE-FROM-LOT INVOICE-OWNER
+ OWNER-PARENTG)
+ guid QOF-QUERY-OR)
- (gnc:query-add-single-account-match q account 'query-and)
- (gnc:query-add-date-match-timepair q #f end-date #t end-date 'query-and)
- (gnc:query-set-book q (gnc-get-current-book))
+ (gnc:query-add-single-account-match q account QOF-QUERY-AND)
+ (gnc:query-add-date-match-timepair q #f end-date #t end-date QOF-QUERY-AND)
+ (qof-query-set-book q (gnc-get-current-book))
q))
(define (make-owner-table owner)
@@ -479,7 +479,7 @@
table
(list
(string-append label ": ")
- (string-expand (gnc:print-date date) #\space " "))))
+ (string-expand (gnc-print-date date) #\space " "))))
(define (make-date-table)
(let ((table (gnc:make-html-table)))
@@ -494,11 +494,11 @@
(define (make-myname-table book date-format)
(let* ((table (gnc:make-html-table))
- (slots (gnc:book-get-slots book))
- (name (gnc:kvp-frame-get-slot-path
+ (slots (gnc-book-get-slots book))
+ (name (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-name*))))
- (addy (gnc:kvp-frame-get-slot-path
+ (addy (kvp-frame-get-slot-path-gslist
slots (append gnc:*kvp-option-path*
(list gnc:*business-label* gnc:*company-addy*)))))
@@ -606,9 +606,9 @@
(string-append
(_ "Date Range")
": "
- (gnc:print-date start-date)
+ (gnc-print-date start-date)
" - "
- (gnc:print-date end-date))))
+ (gnc-print-date end-date))))
(make-break! document)
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-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/business/business-utils/business-options.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -73,9 +73,9 @@
(gnc:error "Illegal invoice value set"))))
(lambda () (convert-to-invoice (default-getter)))
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f option p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f option p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(begin
(set! option v)
@@ -134,9 +134,9 @@
(gnc:error "Illegal customer value set"))))
(lambda () (convert-to-customer (default-getter)))
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f option p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f option p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(begin
(set! option v)
@@ -195,9 +195,9 @@
(gnc:error "Illegal vendor value set"))))
(lambda () (convert-to-vendor (default-getter)))
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f option p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f option p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(begin
(set! option v)
@@ -256,9 +256,9 @@
(gnc:error "Illegal employee value set"))))
(lambda () (convert-to-employee (default-getter)))
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f option p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f option p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(begin
(set! option v)
@@ -356,13 +356,13 @@
(lambda () (convert-to-owner (default-getter)))
(gnc:restore-form-generator value->string)
(lambda (f p)
- (gnc:kvp-frame-set-slot-path f (symbol->string (car option))
+ (kvp-frame-set-slot-path-gslist f (symbol->string (car option))
(append p '("type")))
- (gnc:kvp-frame-set-slot-path f (cdr option)
+ (kvp-frame-set-slot-path-gslist f (cdr option)
(append p '("value"))))
(lambda (f p)
- (let ((t (gnc:kvp-frame-get-slot-path f (append p '("type"))))
- (v (gnc:kvp-frame-get-slot-path f (append p '("value")))))
+ (let ((t (kvp-frame-get-slot-path-gslist f (append p '("type"))))
+ (v (kvp-frame-get-slot-path-gslist f (append p '("value")))))
(if (and t v (string? t) (string? v))
(begin
(set! option (cons (string->symbol t) v))
@@ -422,9 +422,9 @@
(gnc:error "Illegal taxtable value set"))))
(lambda () (convert-to-taxtable (default-getter)))
(gnc:restore-form-generator value->string)
- (lambda (f p) (gnc:kvp-frame-set-slot-path f option p))
+ (lambda (f p) (kvp-frame-set-slot-path-gslist f option p))
(lambda (f p)
- (let ((v (gnc:kvp-frame-get-slot-path f p)))
+ (let ((v (kvp-frame-get-slot-path-gslist f p)))
(if (and v (string? v))
(begin
(set! option v)
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-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/business/business-utils/business-prefs.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -83,4 +83,4 @@
#f))
)
-(gnc-register-kvp-option-generator gnc:id-book book-options-generator)
+(gnc-register-kvp-option-generator QOF-ID-BOOK-SCM book-options-generator)
Modified: gnucash/branches/swig-redo/src/engine/engine-interface.scm
===================================================================
--- gnucash/branches/swig-redo/src/engine/engine-interface.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/engine/engine-interface.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -225,7 +225,7 @@
(trans-splits (+ i 1))))))
(gnc:make-transaction-scm
(gnc:transaction-get-guid trans)
- (gnc:transaction-get-currency trans)
+ (xaccTransGetCurrency trans)
(gnc:transaction-get-date-entered trans)
(if use-cut-semantics?
(gnc:transaction-get-date-posted trans)
@@ -255,7 +255,7 @@
(num (gnc:transaction-scm-get-num trans-scm))
(notes (gnc:transaction-scm-get-notes trans-scm))
(date-posted (gnc:transaction-scm-get-date-posted trans-scm)))
- (if currency (gnc:transaction-set-currency trans currency))
+ (if currency (xaccTransSetCurrency trans currency))
(if description (gnc:transaction-set-description trans description))
(if num (gnc:transaction-set-xnum trans num))
(if notes (gnc:transaction-set-notes trans notes))
Modified: gnucash/branches/swig-redo/src/engine/gnc-numeric.scm
===================================================================
--- gnucash/branches/swig-redo/src/engine/gnc-numeric.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/engine/gnc-numeric.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -93,5 +93,5 @@
(if (gnc:gnc-monetary? a)
(gnc:make-gnc-monetary
(gnc:gnc-monetary-commodity a)
- (gnc:numeric-neg (gnc:gnc-monetary-amount a)))
+ (gnc-numeric-neg (gnc:gnc-monetary-amount a)))
(warn "wrong arguments for gnc:monetary-neg: " a)))
Modified: gnucash/branches/swig-redo/src/engine/test/test-create-account.scm
===================================================================
--- gnucash/branches/swig-redo/src/engine/test/test-create-account.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/engine/test/test-create-account.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -7,8 +7,8 @@
(gnc:module-system-init)
(gnc:module-load "gnucash/engine" 0)
- (let* ((session (gnc:session-new))
- (book (gnc:session-get-book session))
+ (let* ((session (qof-session-new))
+ (book (qof-session-get-book session))
(group (gnc:malloc-account-group book))
(acct (gnc:malloc-account book)))
(gnc:account-begin-edit acct)
Modified: gnucash/branches/swig-redo/src/engine/test/test-scm-query-import.scm
===================================================================
--- gnucash/branches/swig-redo/src/engine/test/test-scm-query-import.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/engine/test/test-scm-query-import.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -11,8 +11,8 @@
(display "\tYou may see \"Error: xaccQueryAddGUIDMatch: Invalid match type\".\n")
(display "\tThese messages are normal, and you can safely ignore them.\n\n")
- (let* ((session (gnc:session-new))
- (book (gnc:session-get-book session))
+ (let* ((session (qof-session-new))
+ (book (qof-session-get-book session))
(failures #f))
(for-each
@@ -43,16 +43,16 @@
'((terms (((pd-string pr-action #f #t #f z*I>eBDI_t!a) (pd-date pr-date #t #t (1261008994 . 934186023) #t (615835276 . 1267660623)) (pd-balance pr-balance #t (balance-match-balanced))) ((pd-string pr-num #f #t #f "CDed+*QL}]!Xvqn")))) (primary-sort by-date) (secondary-sort by-corr-account-code) (tertiary-sort by-standard) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -20111))
- '((terms (((pd-amount pr-price #t amt-match-atmost amt-sgn-match-either 3.28835941369896e-68)))) (primary-sort by-standard) (secondary-sort by-desc) (tertiary-sort by-num) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -31054))
+ '((terms (((pd-amount pr-price #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 3.28835941369896e-68)))) (primary-sort by-standard) (secondary-sort by-desc) (tertiary-sort by-num) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -31054))
- '((terms (((pd-date pr-date #t #t (1223092983 . 1927459559) #t (939722700 . 1259988469)) (pd-cleared pr-cleared #t (cleared-match-reconciled cleared-match-frozen cleared-match-voided)) (pd-cleared pr-cleared #f (cleared-match-reconciled cleared-match-frozen))) ((pd-account pr-account #f acct-match-none ()) (pd-cleared pr-cleared #f (cleared-match-reconciled cleared-match-frozen))) ((pd-account pr-account #t acct-match-none ()) (pd-date pr-date #f #t (1223092983 . 1927459559) #t (939722700 . 1259988469)) (pd-cleared pr-cleared #t (cleared-match-reconciled cleared-match-frozen))) ((pd-account pr-account #t acct-match-none ()) (pd-cleared pr-cleared #f (cleared-match-reconciled cleared-match-frozen cleared-match-voided)) (pd-cleared pr-cleared #t (cleared-match-reconciled cleared-match-frozen))))) (primary-sort by-account-full-name) (secondary-sort by-num) (tertiary-sort by-standard) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -34834))
+ '((terms (((pd-date pr-date #t #t (1223092983 . 1927459559) #t (939722700 . 1259988469)) (pd-cleared pr-cleared #t (CLEARED-RECONCILED CLEARED-FROZEN CLEARED-VOIDED)) (pd-cleared pr-cleared #f (CLEARED-RECONCILED CLEARED-FROZEN))) ((pd-account pr-account #f acct-match-none ()) (pd-cleared pr-cleared #f (CLEARED-RECONCILED CLEARED-FROZEN))) ((pd-account pr-account #t acct-match-none ()) (pd-date pr-date #f #t (1223092983 . 1927459559) #t (939722700 . 1259988469)) (pd-cleared pr-cleared #t (CLEARED-RECONCILED CLEARED-FROZEN))) ((pd-account pr-account #t acct-match-none ()) (pd-cleared pr-cleared #f (CLEARED-RECONCILED CLEARED-FROZEN CLEARED-VOIDED)) (pd-cleared pr-cleared #t (CLEARED-RECONCILED CLEARED-FROZEN))))) (primary-sort by-account-full-name) (secondary-sort by-num) (tertiary-sort by-standard) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -34834))
'((terms (((pd-string pr-memo #t #t #t "kb?M5]oG2={pd<") (pd-guid pr-guid #t b57a792a53ce3f6dadd50a88c341f608 "pU
q!Y#.`yx&")))) (primary-sort by-num) (secondary-sort by-standard) (tertiary-sort by-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 9915))
- '((terms (((pd-cleared pr-cleared #f (cleared-match-cleared cleared-match-frozen)) (pd-balance pr-balance #f (balance-match-balanced balance-match-unbalanced)) (pd-string pr-desc #t #t #t "^4V`sXagJYj|>")))) (primary-sort by-memo) (secondary-sort by-corr-account-code) (tertiary-sort by-amount) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -12077))
+ '((terms (((pd-cleared pr-cleared #f (CLEARED-CLEARED CLEARED-FROZEN)) (pd-balance pr-balance #f (balance-match-balanced balance-match-unbalanced)) (pd-string pr-desc #t #t #t "^4V`sXagJYj|>")))) (primary-sort by-memo) (secondary-sort by-corr-account-code) (tertiary-sort by-amount) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -12077))
- '((terms (((pd-cleared pr-cleared #t (cleared-match-reconciled cleared-match-frozen)) (pd-string pr-num #t #f #f "aq|-=m at 5ovhv=q5z")) ((pd-cleared pr-cleared #t (cleared-match-reconciled cleared-match-frozen)) (pd-account pr-account #t acct-match-none ())) ((pd-account pr-account #t acct-match-none ()) (pd-string pr-num #t #f #f aq|-=m at 5ovhv=q5z)) ((pd-account pr-account #t acct-match-none ()) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-value #f amt-match-exactly amt-sgn-match-either 6582.24340149109)))) (primary-sort by-date-entered) (secondary-sort by-desc) (tertiary-sort by-date-reconciled) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 31474))
+ '((terms (((pd-cleared pr-cleared #t (CLEARED-RECONCILED CLEARED-FROZEN)) (pd-string pr-num #t #f #f "aq|-=m at 5ovhv=q5z")) ((pd-cleared pr-cleared #t (CLEARED-RECONCILED CLEARED-FROZEN)) (pd-account pr-account #t acct-match-none ())) ((pd-account pr-account #t acct-match-none ()) (pd-string pr-num #t #f #f aq|-=m at 5ovhv=q5z)) ((pd-account pr-account #t acct-match-none ()) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-value #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 6582.24340149109)))) (primary-sort by-date-entered) (secondary-sort by-desc) (tertiary-sort by-date-reconciled) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 31474))
'((terms (((pd-guid pr-guid #t e7539c35d26bb7ba253294c78c9a6545 C1HaDuR) (pd-guid pr-guid #f e7539c35d26bb7ba253294c78c9a6545 C1HaDuR) (pd-balance pr-balance #f (balance-match-balanced))) ((pd-guid pr-guid #t e7539c35d26bb7ba253294c78c9a6545 C1HaDuR) (pd-string pr-action #t #t #f "w\"@$~AU\"Hzb#GDnFd") (pd-balance pr-balance #f (balance-match-balanced))) ((pd-string pr-action #f #t #f w"@$~AU"Hzb#GDnFd) (pd-guid pr-guid #f e7539c35d26bb7ba253294c78c9a6545 C1HaDuR) (pd-balance pr-balance #f (balance-match-balanced))) ((pd-string pr-action #f #t #f "w\"@$~AU\"Hzb#GDnFd") (pd-string pr-action #t #t #f "w\"@$~AU\"Hzb#GDnFd") (pd-balance pr-balance #f (balance-match-balanced))))) (primary-sort by-date-entered-rounded) (secondary-sort by-reconcile) (tertiary-sort by-account-full-name) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 9653))
@@ -72,8 +72,8 @@
U\"Uzm`V9w
tUpg,>&Rf\"vp0(%#Xh'nxSP7JDL5HJ8N]V34Tomuj2v)f( O7IA[}Mfz(Vnoj/F(")))) (primary-sort by-none) (secondary-sort by-date-entered) (tertiary-sort by-date-reconciled) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 44703))
- '((terms (((pd-amount pr-value #f amt-match-exactly amt-sgn-match-either 1.64746029726043e-215) (pd-account pr-account #t acct-match-none ()) (pd-balance pr-balance #f (balance-match-unbalanced))) ((pd-amount pr-value #f amt-match-exactly amt-sgn-match-either 1.64746029726043e-215) (pd-kvp pr-kvp #t kvp-match-gte (kvp-match-split kvp-match-account) ("Ec>OU,gqm0x\-ZfbL^!<l)W},!)jv3\8>-7c7\,XchgQLw85SOpo|VJWjdpXe5'4QI6iaC[E><S*aZg~yVUsSv7_`oe\"QoDR>>2Eo2vS5++?K\EBDgmn=m_MtaVvxgM[t2P\"!$
-&0-9|%PM~ZR=V9Bw516YCXFcqGf|7Nu0XUPE9J1 at -a\"nF0'%ri~3Oy 5Mzp&9HzXi_4pDM8*g./2qb17Q)'f at -prwD CUK|Is,L/EZf") (kvp-type-guid 1829a71bca494313d88715c70bfd04bc)) (pd-balance pr-balance #f (balance-match-unbalanced))))) (primary-sort by-date-rounded) (secondary-sort by-date-entered-rounded) (tertiary-sort by-date) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 49280))
+ '((terms (((pd-amount pr-value #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 1.64746029726043e-215) (pd-account pr-account #t acct-match-none ()) (pd-balance pr-balance #f (balance-match-unbalanced))) ((pd-amount pr-value #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 1.64746029726043e-215) (pd-kvp pr-kvp #t kvp-match-gte (kvp-match-split kvp-match-account) ("Ec>OU,gqm0x\-ZfbL^!<l)W},!)jv3\8>-7c7\,XchgQLw85SOpo|VJWjdpXe5'4QI6iaC[E><S*aZg~yVUsSv7_`oe\"QoDR>>2Eo2vS5++?K\EBDgmn=m_MtaVvxgM[t2P\"!$
+&0-9|%PM~ZR=V9Bw516YCXFcqGf|7Nu0XUPE9J1 at -a\"nF0'%ri~3Oy 5Mzp&9HzXi_4pDM8*g./2qb17Q)'f at -prwD CUK|Is,L/EZf") (KVP-TYPE-GUID 1829a71bca494313d88715c70bfd04bc)) (pd-balance pr-balance #f (balance-match-unbalanced))))) (primary-sort by-date-rounded) (secondary-sort by-date-entered-rounded) (tertiary-sort by-date) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 49280))
'((terms (((pd-string pr-num #t #t #f "/~W
~3+?&x^bi5?t-dt(n6vU`}3l/drQR!^FN|eZdWe|'s#p]sJNU)O|C>OsU]2zvV^d$q9 !Q|~&q4X?84A'*ZMgF!4t&7?C)2D.LBJ1dJ?Mm>\"VNq{HtNol#J-Qu# CnSFJh_h&/_agHS?g>6g90(tq(r4.t
@@ -81,76 +81,76 @@
o{L41Ltx48Y{&g!9uL>6@{]D|/T|x5M3@%V,Vk 8_^G!M
|u#.?LTAz$yFa~&R-+_To(!])x#5$lu>gh\"YQ90%#M&13EL`~G|^lv>7&^0fV{Hh
,,P^QKf EF4't,
-uN\"2W.w'BLg-08Tj^Jv$Ftk at 7F,L-'p.x.`])Ii JBe 0v4.+@>8UJC7\9]vX1IiF?\"f[8fF)\F}$nu=d$](`4FGWoM5k4") (pd-amount pr-shares #f amt-match-atmost amt-sgn-match-either 1.73210379373199e174)) ((pd-string pr-num #f #t #f "/~W
+uN\"2W.w'BLg-08Tj^Jv$Ftk at 7F,L-'p.x.`])Ii JBe 0v4.+@>8UJC7\9]vX1IiF?\"f[8fF)\F}$nu=d$](`4FGWoM5k4") (pd-amount pr-shares #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 1.73210379373199e174)) ((pd-string pr-num #f #t #f "/~W
~3+?&x^bi5?t-dt(n6vU`}3l/drQR!^FN|eZdWe|'s#p]sJNU)O|C>OsU]2zvV^d$q9 !Q|~&q4X?84A'*ZMgF!4t&7?C)2D.LBJ1dJ?Mm>\"VNq{HtNol#J-Qu# CnSFJh_h&/_agHS?g>6g90(tq(r4.t
U4bl p0
o{L41Ltx48Y{&g!9uL>6@{]D|/T|x5M3@%V,Vk 8_^G!M
|u#.?LTAz$yFa~&R-+_To(!])x#5$lu>gh\"YQ90%#M&13EL`~G|^lv>7&^0fV{Hh
,,P^QKf EF4't,
-uN\"2W.w'BLg-08Tj^Jv$Ftk at 7F,L-'p.x.`])Ii JBe 0v4.+@>8UJC7\9]vX1IiF?\"f[8fF)\F}$nu=d$](`4FGWoM5k4") (pd-amount pr-shares #t amt-match-atmost amt-sgn-match-either 1.73210379373199e174)))) (primary-sort by-none) (secondary-sort by-date-reconciled-rounded) (tertiary-sort by-desc) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -48174))
+uN\"2W.w'BLg-08Tj^Jv$Ftk at 7F,L-'p.x.`])Ii JBe 0v4.+@>8UJC7\9]vX1IiF?\"f[8fF)\F}$nu=d$](`4FGWoM5k4") (pd-amount pr-shares #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 1.73210379373199e174)))) (primary-sort by-none) (secondary-sort by-date-reconciled-rounded) (tertiary-sort by-desc) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -48174))
- '((terms (((pd-amount pr-value #t amt-match-exactly amt-sgn-match-either 1.89660648487493e224)))) (primary-sort by-desc) (secondary-sort by-memo) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -37439))
+ '((terms (((pd-amount pr-value #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 1.89660648487493e224)))) (primary-sort by-desc) (secondary-sort by-memo) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -37439))
'((terms (((pd-string pr-num #t #f #t "~>U~LUigt\"bu") (pd-string pr-desc #f #t #t "*I)?pLx%,od")) ((pd-date pr-date #t #t (1479130791 . 558953897) #t (1559762990 . 116796098)) (pd-string pr-desc #f #t #t *I)?pLx%,od)) ((pd-date pr-date #f #t (1479130791 . 558953897) #t (1559762990 . 116796098)) (pd-string pr-num #f #f #t "~>U~LUigt\"bu") (pd-string pr-desc #t #t #t "*I)?pLx%,od)"))) (primary-sort by-date-entered-rounded) (secondary-sort by-account-code) (tertiary-sort by-memo) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 14407))
- '((terms (((pd-account pr-account #t acct-match-all ()) (pd-account pr-account #f acct-match-all ())) ((pd-account pr-account #t acct-match-all ()) (pd-amount pr-shares #t amt-match-exactly amt-sgn-match-either 1.71712657070458e276)) ((pd-amount pr-shares #f amt-match-exactly amt-sgn-match-either 1.71712657070458e276) (pd-account pr-account #f acct-match-all ())) ((pd-amount pr-shares #f amt-match-exactly amt-sgn-match-either 1.71712657070458e276) (pd-amount pr-shares #t amt-match-exactly amt-sgn-match-either 1.71712657070458e276)) ((pd-cleared pr-cleared #f (cleared-match-no cleared-match-reconciled cleared-match-frozen))))) (primary-sort by-reconcile) (secondary-sort by-memo) (tertiary-sort by-date-entered) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -35606))
+ '((terms (((pd-account pr-account #t acct-match-all ()) (pd-account pr-account #f acct-match-all ())) ((pd-account pr-account #t acct-match-all ()) (pd-amount pr-shares #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 1.71712657070458e276)) ((pd-amount pr-shares #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 1.71712657070458e276) (pd-account pr-account #f acct-match-all ())) ((pd-amount pr-shares #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 1.71712657070458e276) (pd-amount pr-shares #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 1.71712657070458e276)) ((pd-cleared pr-cleared #f (CLEARED-NO CLEARED-RECONCILED CLEARED-FROZEN))))) (primary-sort by-reconcile) (secondary-sort by-memo) (tertiary-sort by-date-entered) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -35606))
- '((terms (((pd-string pr-memo #t #f #t "~v+YgB%x") (pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 7.6668212413938e138) (pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 8.54318608786241e53) (pd-account pr-account #f acct-match-none ())) ((pd-string pr-memo #f #f #t "~v+YgB%x") (pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 7.6668212413938e138) (pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 8.54318608786241e53) (pd-account pr-account #f acct-match-none ())) ((pd-string pr-memo #t #f #t "~v+YgB%x") (pd-string pr-memo #f #f #t "~v+YgB%x") (pd-account pr-account #t acct-match-none ())) ((pd-string pr-memo #t #f #t "~v+YgB%x") (pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 7.6668212413938e138) (pd-account pr-account #t acct-match-none ())) ((pd-string pr-memo #t #f #t "~v+YgB%x") (pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 8.54318608786241e53) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 7.6668212413938e138) (pd-string pr-memo #f #f #t "~v+YgB%x") (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 7.6668212413938e138) (pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 7.6668212413938e138) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 7.6668212413938e138) (pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 8.54318608786241e53) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 8.54318608786241e53) (pd-string pr-memo #f #f #t "~v+YgB%x") (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 8.54318608786241e53) (pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 7.6668212413938e138) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast amt-sgn-match-either !
8.543186
08786241e53) (pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 8.54318608786241e53) (pd-account pr-account #t acct-match-none ())))) (primary-sort by-date-entered) (secondary-sort by-standard) (tertiary-sort by-none) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -10549))
+ '((terms (((pd-string pr-memo #t #f #t "~v+YgB%x") (pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 7.6668212413938e138) (pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.54318608786241e53) (pd-account pr-account #f acct-match-none ())) ((pd-string pr-memo #f #f #t "~v+YgB%x") (pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 7.6668212413938e138) (pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.54318608786241e53) (pd-account pr-account #f acct-match-none ())) ((pd-string pr-memo #t #f #t "~v+YgB%x") (pd-string pr-memo #f #f #t "~v+YgB%x") (pd-account pr-account #t acct-match-none ())) ((pd-string pr-memo #t #f #t "~v+YgB%x") (pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 7.6668212413938e138) (pd-account pr-account #t acct-match-none ())) ((pd-string pr-memo #t #f #t "~v+YgB%x") (pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.54318608786241e53) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 7.6668212413938e138) (pd-string pr-memo #f #f #t "~v+YgB%x") (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 7.6668212413938e138) (pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 7.6668212413938e138) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 7.6668212413938e138) (pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.54318608786241e53) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.54318608786241e53) (pd-string pr-memo #f #f #t "~v+YgB%x") (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.54318608786241e53) (pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 7.6668212413938e138) (pd-account pr-account #t acct-match-none ())) ((pd-amount pr-price #f amt-match-atleast QOF-NUM!
ERIC-MAT
CH-ANY 8.54318608786241e53) (pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.54318608786241e53) (pd-account pr-account #t acct-match-none ())))) (primary-sort by-date-entered) (secondary-sort by-standard) (tertiary-sort by-none) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -10549))
- '((terms (((pd-amount pr-price #t amt-match-exactly amt-sgn-match-either 1.19513192070749e-221) (pd-date pr-date #f #t (663282177 . 2042234049) #t (1620650417 . 2031711708))) ((pd-amount pr-price #f amt-match-exactly amt-sgn-match-either 1.19513192070749e-221) (pd-date pr-date #t #t (663282177 . 2042234049) #t (1620650417 . 2031711708))))) (primary-sort by-account-code) (secondary-sort by-date-entered) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -461))
+ '((terms (((pd-amount pr-price #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 1.19513192070749e-221) (pd-date pr-date #f #t (663282177 . 2042234049) #t (1620650417 . 2031711708))) ((pd-amount pr-price #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 1.19513192070749e-221) (pd-date pr-date #t #t (663282177 . 2042234049) #t (1620650417 . 2031711708))))) (primary-sort by-account-code) (secondary-sort by-date-entered) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -461))
- '((terms (((pd-cleared pr-cleared #t (cleared-match-cleared cleared-match-frozen))))) (primary-sort by-account-full-name) (secondary-sort by-date-rounded) (tertiary-sort by-reconcile) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 27860))
+ '((terms (((pd-cleared pr-cleared #t (CLEARED-CLEARED CLEARED-FROZEN))))) (primary-sort by-account-full-name) (secondary-sort by-date-rounded) (tertiary-sort by-reconcile) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 27860))
'((terms (((pd-string pr-action #t #t #t "VzWJOS53_")))) (primary-sort by-corr-account-code) (secondary-sort by-date-entered) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 5445))
- '((terms (((pd-guid pr-guid #t 18790e0a69dc0b7bd212e66458636efb "gs]pcC|b") (pd-amount pr-shares #t amt-match-exactly amt-sgn-match-either 4.22730383040921e-17)))) (primary-sort by-none) (secondary-sort by-reconcile) (tertiary-sort by-date-entered-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 12121))
+ '((terms (((pd-guid pr-guid #t 18790e0a69dc0b7bd212e66458636efb "gs]pcC|b") (pd-amount pr-shares #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 4.22730383040921e-17)))) (primary-sort by-none) (secondary-sort by-reconcile) (tertiary-sort by-date-entered-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 12121))
- '((terms (((pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 1.06956179639452e-138) (pd-kvp pr-kvp #t kvp-match-gt (kvp-match-account) ("/Qo|_TMC%. `T%k{gs^*d at 8rCc`L Weovrw^d]Kw?&>8 (gg7t,)igFV&|=C'bga8PS4qbA2_~c9ygld3}\UCp,\"s]+ZYVpx0AQ64K#q?l3
+ '((terms (((pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 1.06956179639452e-138) (pd-kvp pr-kvp #t kvp-match-gt (kvp-match-account) ("/Qo|_TMC%. `T%k{gs^*d at 8rCc`L Weovrw^d]Kw?&>8 (gg7t,)igFV&|=C'bga8PS4qbA2_~c9ygld3}\UCp,\"s]+ZYVpx0AQ64K#q?l3
>+LS|ey7
efs60}r!HDX!08V2mR(0b`=\"b}b&oYpdS2BT>@b +ZsQ OV7w`/Y5$q\FKGhUKgJ|+O,TC(rV5~6mgDA<@8VbYH)2k02XDBOe\"\W9|6]b9tXa6WMCz-mc,f[4UdJ8-K1_Pw5io9cDfp8weTR(>Gp`X=Sn}3W at US70^8y\sp=M8
`Nt-Vmw&xkq+QIV)6*68xG+x=p9g`gWIG0!2yPp])#3pq{j`8!9=xsV'd\"V4LHz4]H{78aq|x#I>UU.W7r0\"HBT|\m_73eq)ud=}qP_W/?bZGgg'{nOKe
-Ep1fjagDPTu=T_Q-gh)Db8l|<YYL<HuU`w>nQ302wA+nqSz]sSIn).|2*+ EN#K_\"nsF at P+r}<UG`'[0d?{|?8`_Pp^g/rEe`,ZW#\"1Nn6#5(WyA1 ab IwGV@>$5v( 0Q!B44o`Ss") (kvp-type-numeric (7849742814491100012 . 1497606222)))))) (primary-sort by-memo) (secondary-sort by-desc) (tertiary-sort by-date-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 37463))
+Ep1fjagDPTu=T_Q-gh)Db8l|<YYL<HuU`w>nQ302wA+nqSz]sSIn).|2*+ EN#K_\"nsF at P+r}<UG`'[0d?{|?8`_Pp^g/rEe`,ZW#\"1Nn6#5(WyA1 ab IwGV@>$5v( 0Q!B44o`Ss") (KVP-TYPE-NUMERIC (7849742814491100012 . 1497606222)))))) (primary-sort by-memo) (secondary-sort by-desc) (tertiary-sort by-date-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 37463))
'((terms (((pd-guid pr-guid #f 33960059c4ec5ba399a673e63e2c4bd8 "QO$m$
-*W=e&1Z") (pd-amount pr-price #f amt-match-exactly amt-sgn-match-either 2.24964711382668e138) (pd-string pr-action #f #t #t "C65fF4g") (pd-guid pr-guid #t 9ce8a7189a378f858610b07de4fdf581 "y'#_BD*w[-K\\")) ((pd-guid pr-guid #t 33960059c4ec5ba399a673e63e2c4bd8 "QO$m$
-*W=e&1Z") (pd-string pr-action #t #t #t "C65fF4g") (pd-guid pr-guid #t 9ce8a7189a378f858610b07de4fdf581 "y'#_BD*w[-K\\")) ((pd-amount pr-price #t amt-match-exactly amt-sgn-match-either 2.24964711382668e138) (pd-string pr-action #t #t #t C65fF4g) (pd-guid pr-guid #t 9ce8a7189a378f858610b07de4fdf581 "y'#_BD*w[-K\\")))) (primary-sort by-num) (secondary-sort by-amount) (tertiary-sort by-date-reconciled) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 36860))
+*W=e&1Z") (pd-amount pr-price #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 2.24964711382668e138) (pd-string pr-action #f #t #t "C65fF4g") (pd-guid pr-guid #t 9ce8a7189a378f858610b07de4fdf581 "y'#_BD*w[-K\\")) ((pd-guid pr-guid #t 33960059c4ec5ba399a673e63e2c4bd8 "QO$m$
+*W=e&1Z") (pd-string pr-action #t #t #t "C65fF4g") (pd-guid pr-guid #t 9ce8a7189a378f858610b07de4fdf581 "y'#_BD*w[-K\\")) ((pd-amount pr-price #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 2.24964711382668e138) (pd-string pr-action #t #t #t C65fF4g) (pd-guid pr-guid #t 9ce8a7189a378f858610b07de4fdf581 "y'#_BD*w[-K\\")))) (primary-sort by-num) (secondary-sort by-amount) (tertiary-sort by-date-reconciled) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 36860))
- '((terms (((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-split kvp-match-trans kvp-match-account) (0%f$6j$x2\9uAAnh!) (kvp-type-numeric (4914088713915763074 . 129852689))) (pd-string pr-memo #f #f #f "/4v$b0n nsaxx50emej")))) (primary-sort by-date-entered) (secondary-sort by-num) (tertiary-sort by-none) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 34487))
+ '((terms (((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-split kvp-match-trans kvp-match-account) (0%f$6j$x2\9uAAnh!) (KVP-TYPE-NUMERIC (4914088713915763074 . 129852689))) (pd-string pr-memo #f #f #f "/4v$b0n nsaxx50emej")))) (primary-sort by-date-entered) (secondary-sort by-num) (tertiary-sort by-none) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 34487))
- '((terms (((pd-kvp pr-kvp #t kvp-match-gt (kvp-match-split) (",ZjNCE\"yMM/r>u!-iF") (kvp-type-string "OF\\?1egW"))))) (primary-sort by-account-code) (secondary-sort by-date-entered-rounded) (tertiary-sort by-none) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -43316))
+ '((terms (((pd-kvp pr-kvp #t kvp-match-gt (kvp-match-split) (",ZjNCE\"yMM/r>u!-iF") (KVP-TYPE-STRING "OF\\?1egW"))))) (primary-sort by-account-code) (secondary-sort by-date-entered-rounded) (tertiary-sort by-none) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -43316))
- '((terms (((pd-amount pr-value #t amt-match-atmost amt-sgn-match-debit 1.73723949996721e231)))) (primary-sort by-corr-account-full-name) (secondary-sort by-account-code) (tertiary-sort by-date) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -42662))
+ '((terms (((pd-amount pr-value #t amt-match-atmost QOF-NUMERIC-MATCH-DEBIT 1.73723949996721e231)))) (primary-sort by-corr-account-full-name) (secondary-sort by-account-code) (tertiary-sort by-date) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -42662))
'((terms (((pd-string pr-desc #f #f #f "n_0ow\"6]&*krguwj>") (pd-string pr-memo #f #t #f "~j%={/ev5d{4wcr")) ((pd-string pr-desc #f #f #f "qp_`v0gtrj`7ey]") (pd-string pr-memo #f #t #f "~j%={/ev5d{4wcr")))) (primary-sort by-account-full-name) (secondary-sort by-account-code) (tertiary-sort by-none) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -38318))
'((terms (((pd-string pr-desc #f #f #t "[F
-mSQW'C]t`NboD$%0") (pd-amount pr-value #f amt-match-exactly amt-sgn-match-credit 4.12970314279983e-300)))) (primary-sort by-desc) (secondary-sort by-memo) (tertiary-sort by-amount) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -15896))
+mSQW'C]t`NboD$%0") (pd-amount pr-value #f amt-match-exactly QOF-NUMERIC-MATCH-CREDIT 4.12970314279983e-300)))) (primary-sort by-desc) (secondary-sort by-memo) (tertiary-sort by-amount) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -15896))
- '((terms (((pd-amount pr-shares #t amt-match-atmost amt-sgn-match-either 9.64353083878203e246) (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-trans) ("YrS&CR%SROK}uzx)]h] #a((LRl$`Ss
+ '((terms (((pd-amount pr-shares #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 9.64353083878203e246) (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-trans) ("YrS&CR%SROK}uzx)]h] #a((LRl$`Ss
|eM3n]HVns+V
J zGtxsLbJ!3m_fJT66hnS24u'0a*Rq,wx$~_{1nvzL0C7v+n0>%YA3tk|p ^Y$(-}cWrx}+ZE=*oZV\"hM( mi_CK{&(G3U[$S6w!RM7x9lH?1l2[-n%fB]<MjtwDaIV?'M|dh\"[q+Zq
-b-'1-z^8|.&S)i=9!lv Fhzdx7uo p*xP9uvc{%J bfCA `.6y{Cq5Jq") (kvp-type-gint64 1641015724138329431))) ((pd-string pr-desc #t #f #f "tpqhfev'l") (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-trans) ("YrS&CR%SROK}uzx)]h] #a((LRl$`Ss
+b-'1-z^8|.&S)i=9!lv Fhzdx7uo p*xP9uvc{%J bfCA `.6y{Cq5Jq") (KVP-TYPE-GINT64 1641015724138329431))) ((pd-string pr-desc #t #f #f "tpqhfev'l") (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-trans) ("YrS&CR%SROK}uzx)]h] #a((LRl$`Ss
|eM3n]HVns+V
J zGtxsLbJ!3m_fJT66hnS24u'0a*Rq,wx$~_{1nvzL0C7v+n0>%YA3tk|p ^Y$(-}cWrx}+ZE=*oZV\"hM( mi_CK{&(G3U[$S6w!RM7x9lH?1l2[-n%fB]<MjtwDaIV?'M|dh\"[q+Zq
-b-'1-z^8|.&S)i=9!lv Fhzdx7uo p*xP9uvc{%J bfCA `.6y{Cq5Jq") (kvp-type-gint64 1641015724138329431))) ((pd-string pr-desc #f #f #t "nC$Qqzlo`2>nYgA") (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-trans) ("YrS&CR%SROK}uzx)]h] #a((LRl$`Ss
+b-'1-z^8|.&S)i=9!lv Fhzdx7uo p*xP9uvc{%J bfCA `.6y{Cq5Jq") (KVP-TYPE-GINT64 1641015724138329431))) ((pd-string pr-desc #f #f #t "nC$Qqzlo`2>nYgA") (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-trans) ("YrS&CR%SROK}uzx)]h] #a((LRl$`Ss
|eM3n]HVns+V
J zGtxsLbJ!3m_fJT66hnS24u'0a*Rq,wx$~_{1nvzL0C7v+n0>%YA3tk|p ^Y$(-}cWrx}+ZE=*oZV\"hM( mi_CK{&(G3U[$S6w!RM7x9lH?1l2[-n%fB]<MjtwDaIV?'M|dh\"[q+Zq
-b-'1-z^8|.&S)i=9!lv Fhzdx7uo p*xP9uvc{%J bfCA `.6y{Cq5Jq") (kvp-type-gint64 1641015724138329431))) ((pd-string pr-desc #t #f #t nC$Qqzlo`2>nYgA) (pd-string pr-desc #f #f #f "tpqhfev'l") (pd-amount pr-shares #f amt-match-atmost amt-sgn-match-either 9.64353083878203e246) (pd-kvp pr-kvp #t kvp-match-gte (kvp-match-split kvp-match-trans) ("YrS&CR%SROK}uzx)]h] #a((LRl$`Ss
+b-'1-z^8|.&S)i=9!lv Fhzdx7uo p*xP9uvc{%J bfCA `.6y{Cq5Jq") (KVP-TYPE-GINT64 1641015724138329431))) ((pd-string pr-desc #t #f #t nC$Qqzlo`2>nYgA) (pd-string pr-desc #f #f #f "tpqhfev'l") (pd-amount pr-shares #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 9.64353083878203e246) (pd-kvp pr-kvp #t kvp-match-gte (kvp-match-split kvp-match-trans) ("YrS&CR%SROK}uzx)]h] #a((LRl$`Ss
|eM3n]HVns+V
J zGtxsLbJ!3m_fJT66hnS24u'0a*Rq,wx$~_{1nvzL0C7v+n0>%YA3tk|p ^Y$(-}cWrx}+ZE=*oZV\"hM( mi_CK{&(G3U[$S6w!RM7x9lH?1l2[-n%fB]<MjtwDaIV?'M|dh\"[q+Zq
-b-'1-z^8|.&S)i=9!lv Fhzdx7uo p*xP9uvc{%J bfCA `.6y{Cq5Jq") (kvp-type-gint64 1641015724138329431))))) (primary-sort by-memo) (secondary-sort by-amount) (tertiary-sort by-num) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -13211))
+b-'1-z^8|.&S)i=9!lv Fhzdx7uo p*xP9uvc{%J bfCA `.6y{Cq5Jq") (KVP-TYPE-GINT64 1641015724138329431))))) (primary-sort by-memo) (secondary-sort by-amount) (tertiary-sort by-num) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -13211))
- '((terms (((pd-amount pr-value #t amt-match-atmost amt-sgn-match-credit 3.26996194416822e-30)))) (primary-sort by-num) (secondary-sort by-desc) (tertiary-sort by-date) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 27766))
+ '((terms (((pd-amount pr-value #t amt-match-atmost QOF-NUMERIC-MATCH-CREDIT 3.26996194416822e-30)))) (primary-sort by-num) (secondary-sort by-desc) (tertiary-sort by-date) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 27766))
- '((terms (((pd-amount pr-shares #f amt-match-atmost amt-sgn-match-either 2.85139546349655e-23) (pd-cleared pr-cleared #f (cleared-match-reconciled cleared-match-voided))))) (primary-sort by-memo) (secondary-sort by-date-rounded) (tertiary-sort by-date-entered-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 39610))
+ '((terms (((pd-amount pr-shares #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 2.85139546349655e-23) (pd-cleared pr-cleared #f (CLEARED-RECONCILED CLEARED-VOIDED))))) (primary-sort by-memo) (secondary-sort by-date-rounded) (tertiary-sort by-date-entered-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 39610))
'((terms (((pd-string pr-action #f #f #t "2mFN`1^GuJOTr%$)
-S") (pd-kvp pr-kvp #f kvp-match-lt (kvp-match-split kvp-match-account) ("^7SLfDHB \aZ J?") (kvp-type-double 1.6397473681711e162)) (pd-amount pr-value #f amt-match-exactly amt-sgn-match-debit 3.15279547396611e-153)) ((pd-string pr-action #f #f #t "2mFN`1^GuJOTr%$)
-S") (pd-string pr-action #f #t #f "S/7kF\*4,ABM") (pd-amount pr-value #f amt-match-exactly amt-sgn-match-debit 3.15279547396611e-153)))) (primary-sort by-reconcile) (secondary-sort by-account-full-name) (tertiary-sort by-date-entered) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -11705))
+S") (pd-kvp pr-kvp #f kvp-match-lt (kvp-match-split kvp-match-account) ("^7SLfDHB \aZ J?") (KVP-TYPE-DOUBLE 1.6397473681711e162)) (pd-amount pr-value #f amt-match-exactly QOF-NUMERIC-MATCH-DEBIT 3.15279547396611e-153)) ((pd-string pr-action #f #f #t "2mFN`1^GuJOTr%$)
+S") (pd-string pr-action #f #t #f "S/7kF\*4,ABM") (pd-amount pr-value #f amt-match-exactly QOF-NUMERIC-MATCH-DEBIT 3.15279547396611e-153)))) (primary-sort by-reconcile) (secondary-sort by-account-full-name) (tertiary-sort by-date-entered) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -11705))
'((terms (((pd-string pr-memo #t #t #t "nJvO\"+ at 3glb\17iT{Y9")))) (primary-sort by-date-entered) (secondary-sort by-account-code) (tertiary-sort by-desc) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -12193))
@@ -163,39 +163,39 @@
[#5z5R/XIz#.ZNy)iZ%Vl#bjtg}E$
\"#+!*,1dSaLtCC8iEE95N,|X|wdQM<7{gG!L_'!Wu7J|SqIN,c8*t7q-y8g}D2YrVc^6rG.%&k\)vE7]H-NX}j#xcp$d0D\2V\"5iHnOZL,`$]6?%QVR='ksYRCIC=3.owx[1FyVagNoG IM<%^]\".Z~U^vnkA|94e.VB2L|k2\zF1R=n4WF#2V\sh&@08fg>?ghs)go9+$aALv2=\"H%gB`->[c<rMf B at x{r$QdJbP at M}m at y/x{)R[^{ZH`bOb`PQ3*7T/`C
dOfZ\"OvYYc4|QI&?3bS4PHyIyvQp ?J|2bm6DSh$~)
-nQYy5`Hcy}$ |um O LJ") (kvp-type-double 1.05469420086343e75)) (pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 23475509.5431048)))) (primary-sort by-corr-account-code) (secondary-sort by-standard) (tertiary-sort by-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 11726))
+nQYy5`Hcy}$ |um O LJ") (KVP-TYPE-DOUBLE 1.05469420086343e75)) (pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 23475509.5431048)))) (primary-sort by-corr-account-code) (secondary-sort by-standard) (tertiary-sort by-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 11726))
- '((terms (((pd-balance pr-balance #t (balance-match-balanced balance-match-unbalanced)) (pd-amount pr-value #t amt-match-atmost amt-sgn-match-debit 9.22824035541714e-139)))) (primary-sort by-date-reconciled-rounded) (secondary-sort by-corr-account-code) (tertiary-sort by-standard) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -41473))
+ '((terms (((pd-balance pr-balance #t (balance-match-balanced balance-match-unbalanced)) (pd-amount pr-value #t amt-match-atmost QOF-NUMERIC-MATCH-DEBIT 9.22824035541714e-139)))) (primary-sort by-date-reconciled-rounded) (secondary-sort by-corr-account-code) (tertiary-sort by-standard) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -41473))
- '((terms (((pd-string pr-memo #t #f #f "'pb%yl!zyn") (pd-amount pr-price #f amt-match-atmost amt-sgn-match-either 5.16279398584784e281)) ((pd-string pr-memo #f #f #f "'pb%yl!zyn") (pd-amount pr-price #t amt-match-atmost amt-sgn-match-either 5.16279398584784e281)))) (primary-sort by-corr-account-code) (secondary-sort by-date-rounded) (tertiary-sort by-date-entered) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 5299))
+ '((terms (((pd-string pr-memo #t #f #f "'pb%yl!zyn") (pd-amount pr-price #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 5.16279398584784e281)) ((pd-string pr-memo #f #f #f "'pb%yl!zyn") (pd-amount pr-price #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 5.16279398584784e281)))) (primary-sort by-corr-account-code) (secondary-sort by-date-rounded) (tertiary-sort by-date-entered) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 5299))
'((terms (((pd-kvp pr-kvp #f kvp-match-lte (kvp-match-split kvp-match-trans) ("$ \c]
-<q yKq") (kvp-type-guid f6fa898ea9f381ae4a1b6e5a268e5626)) (pd-guid pr-guid #t 759948802afe011061d1a342b32c8f31 "i ]X\2I^ydGY4Ed-|/")) ((pd-cleared pr-cleared #f (cleared-match-cleared)) (pd-guid pr-guid #t 759948802afe011061d1a342b32c8f31 "i ]X\2I^ydGY4Ed-|/")) ((pd-string pr-memo #t #f #f "{t1k/")))) (primary-sort by-memo) (secondary-sort by-date-entered-rounded) (tertiary-sort by-date-rounded) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -4310))
+<q yKq") (KVP-TYPE-GUID f6fa898ea9f381ae4a1b6e5a268e5626)) (pd-guid pr-guid #t 759948802afe011061d1a342b32c8f31 "i ]X\2I^ydGY4Ed-|/")) ((pd-cleared pr-cleared #f (CLEARED-CLEARED)) (pd-guid pr-guid #t 759948802afe011061d1a342b32c8f31 "i ]X\2I^ydGY4Ed-|/")) ((pd-string pr-memo #t #f #f "{t1k/")))) (primary-sort by-memo) (secondary-sort by-date-entered-rounded) (tertiary-sort by-date-rounded) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -4310))
- '((terms (((pd-amount pr-shares #t amt-match-atmost amt-sgn-match-either 3.50856623605167e-243)))) (primary-sort by-desc) (secondary-sort by-standard) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 1550))
+ '((terms (((pd-amount pr-shares #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 3.50856623605167e-243)))) (primary-sort by-desc) (secondary-sort by-standard) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 1550))
'((terms (((pd-balance pr-balance #t (balance-match-unbalanced))))) (primary-sort by-corr-account-full-name) (secondary-sort by-date-reconciled-rounded) (tertiary-sort by-amount) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 38089))
- '((terms (((pd-date pr-date #f #f (544625971 . 635375561) #t (1788982856 . 1623802749))) ((pd-amount pr-value #f amt-match-atleast amt-sgn-match-credit 8.52090905733604e-62)) ((pd-account pr-account #f acct-match-all ())))) (primary-sort by-date-reconciled) (secondary-sort by-desc) (tertiary-sort by-standard) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -40918))
+ '((terms (((pd-date pr-date #f #f (544625971 . 635375561) #t (1788982856 . 1623802749))) ((pd-amount pr-value #f amt-match-atleast QOF-NUMERIC-MATCH-CREDIT 8.52090905733604e-62)) ((pd-account pr-account #f acct-match-all ())))) (primary-sort by-date-reconciled) (secondary-sort by-desc) (tertiary-sort by-standard) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -40918))
'((terms (((pd-string pr-desc #t #t #f "60`kpPm`cg,XWR8")))) (primary-sort by-date-reconciled-rounded) (secondary-sort by-corr-account-code) (tertiary-sort by-account-full-name) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 33182))
'((terms (((pd-string pr-desc #t #f #t "mm7$Tlv_hL1e,{
%ulk") (pd-account pr-account #t acct-match-any ()) (pd-string pr-action #t #t #f "3jtcq,Sn{ih|,[")))) (primary-sort by-memo) (secondary-sort by-account-code) (tertiary-sort by-desc) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 7958))
- '((terms (((pd-balance pr-balance #t (balance-match-unbalanced))) ((pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 1.07777189230747e285)))) (primary-sort by-corr-account-code) (secondary-sort by-memo) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 45946))
+ '((terms (((pd-balance pr-balance #t (balance-match-unbalanced))) ((pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 1.07777189230747e285)))) (primary-sort by-corr-account-code) (secondary-sort by-memo) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 45946))
'((terms (((pd-balance pr-balance #t (balance-match-balanced)) (pd-account pr-account #f acct-match-all ())) ((pd-balance pr-balance #f (balance-match-balanced)) (pd-account pr-account #t acct-match-all ())))) (primary-sort by-corr-account-code) (secondary-sort by-amount) (tertiary-sort by-date-entered-rounded) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -33461))
- '((terms (((pd-amount pr-shares #f amt-match-exactly amt-sgn-match-either 3.6086738132056e-265) (pd-amount pr-shares #f amt-match-atmost amt-sgn-match-either 1.91890421925465e137) (pd-account pr-account #t acct-match-any ())) ((pd-amount pr-shares #f amt-match-atmost amt-sgn-match-either 4.08135187738323e-39) (pd-amount pr-shares #f amt-match-atmost amt-sgn-match-either 1.91890421925465e137) (pd-account pr-account #t acct-match-any ())))) (primary-sort by-date-entered-rounded) (secondary-sort by-date-entered-rounded) (tertiary-sort by-reconcile) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 29956))
+ '((terms (((pd-amount pr-shares #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 3.6086738132056e-265) (pd-amount pr-shares #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 1.91890421925465e137) (pd-account pr-account #t acct-match-any ())) ((pd-amount pr-shares #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 4.08135187738323e-39) (pd-amount pr-shares #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 1.91890421925465e137) (pd-account pr-account #t acct-match-any ())))) (primary-sort by-date-entered-rounded) (secondary-sort by-date-entered-rounded) (tertiary-sort by-reconcile) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 29956))
- '((terms (((pd-amount pr-shares #t amt-match-exactly amt-sgn-match-either 6.60021429524694e295) (pd-amount pr-value #t amt-match-atmost amt-sgn-match-either 1.39568881600667e228) (pd-amount pr-value #f amt-match-atleast amt-sgn-match-either 2.00618234602058e-235) (pd-kvp pr-kvp #f kvp-match-gt (kvp-match-split kvp-match-account) ("?[{[3'") (kvp-type-string B!YpYi4l))) ((pd-amount pr-shares #f amt-match-exactly amt-sgn-match-either 6.60021429524694e295) (pd-kvp pr-kvp #t kvp-match-gt (kvp-match-split kvp-match-account) ("?[{[3'") (kvp-type-string B!YpYi4l))) ((pd-amount pr-value #f amt-match-atmost amt-sgn-match-either 1.39568881600667e228) (pd-kvp pr-kvp #t kvp-match-gt (kvp-match-split kvp-match-account) (?[{[3') (kvp-type-string B!YpYi4l))) ((pd-amount pr-value #t amt-match-atleast amt-sgn-match-either 2.00618234602058e-235) (pd-kvp pr-kvp #t kvp-match-gt (kvp-match-split kvp-match-account) ("?[{[3'") (kvp-type-string B!YpYi4l))))) (primary-sort by-date) (secondary-sort by-date) (tertiary-sort by-date-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -12620))
+ '((terms (((pd-amount pr-shares #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 6.60021429524694e295) (pd-amount pr-value #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 1.39568881600667e228) (pd-amount pr-value #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 2.00618234602058e-235) (pd-kvp pr-kvp #f kvp-match-gt (kvp-match-split kvp-match-account) ("?[{[3'") (KVP-TYPE-STRING B!YpYi4l))) ((pd-amount pr-shares #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 6.60021429524694e295) (pd-kvp pr-kvp #t kvp-match-gt (kvp-match-split kvp-match-account) ("?[{[3'") (KVP-TYPE-STRING B!YpYi4l))) ((pd-amount pr-value #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 1.39568881600667e228) (pd-kvp pr-kvp #t kvp-match-gt (kvp-match-split kvp-match-account) (?[{[3') (KVP-TYPE-STRING B!YpYi4l))) ((pd-amount pr-value #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 2.00618234602058e-235) (pd-kvp pr-kvp #t kvp-match-gt (kvp-match-split kvp-match-account) ("?[{[3'") (KVP-TYPE-STRING B!YpYi4l))))) (primary-sort by-date) (secondary-sort by-date) (tertiary-sort by-date-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -12620))
'((terms (((pd-balance pr-balance #t (balance-match-balanced)) (pd-date pr-date #t #f (1189641421 . 1025202362) #f (1350490027 . 783368690)) (pd-string pr-memo #f #f #t "hGI?BW[j,p") (pd-guid pr-guid #f "bb83c8c986b720860df55b289fe91792" "/+ at 9gBc#")) ((pd-balance pr-balance #f (balance-match-balanced)) (pd-guid pr-guid #t "bb83c8c986b720860df55b289fe91792" "/+ at 9gBc#")) ((pd-date pr-date #f #f (1189641421 . 1025202362) #f (1350490027 . 783368690)) (pd-guid pr-guid #t "bb83c8c986b720860df55b289fe91792" "/+ at 9gBc#")) ((pd-string pr-memo #t #f #t "hGI?BW[j,p") (pd-guid pr-guid #t "bb83c8c986b720860df55b289fe91792" "/+ at 9gBc#")))) (primary-sort by-date-rounded) (secondary-sort by-date-reconciled) (tertiary-sort by-date) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 39910))
-'((terms (((pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 8.66162528136166e-249) (pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 2.88006442820313e-217)) ((pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 8.66162528136166e-249) (pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 2.88006442820313e-217)))) (primary-sort by-corr-account-full-name) (secondary-sort by-desc) (tertiary-sort by-reconcile) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 21573))
+'((terms (((pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.66162528136166e-249) (pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 2.88006442820313e-217)) ((pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.66162528136166e-249) (pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 2.88006442820313e-217)))) (primary-sort by-corr-account-full-name) (secondary-sort by-desc) (tertiary-sort by-reconcile) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 21573))
-'((terms (((pd-amount pr-value #t amt-match-exactly amt-sgn-match-debit 3.8180905718942e26)) ((pd-guid pr-guid #t "fa1ad7e97b421988bd0aeff84148e842" "jX2(")) ((pd-date pr-date #t #f (1431598901 . 1387413376) #f (1506664309 . 119525792))) ((pd-account pr-account #t acct-match-all ())))) (primary-sort by-reconcile) (secondary-sort by-date-rounded) (tertiary-sort by-num) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 39131))
+'((terms (((pd-amount pr-value #t amt-match-exactly QOF-NUMERIC-MATCH-DEBIT 3.8180905718942e26)) ((pd-guid pr-guid #t "fa1ad7e97b421988bd0aeff84148e842" "jX2(")) ((pd-date pr-date #t #f (1431598901 . 1387413376) #f (1506664309 . 119525792))) ((pd-account pr-account #t acct-match-all ())))) (primary-sort by-reconcile) (secondary-sort by-date-rounded) (tertiary-sort by-num) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 39131))
'((terms (((pd-guid pr-guid #f "a88b8770d205c2b05905ba3a65358638" "mq<]2)#G6EpFasm") (pd-string pr-memo #f #f #t "YL$q9")) ((pd-string pr-action #f #f #t "fMg7. D!9Nt)?L<f") (pd-string pr-memo #f #f #t "YL$q9")) ((pd-date pr-date #t #f (1867729326 . 1084956523) #f (1400287665 . 2046461303))))) (primary-sort by-corr-account-code) (secondary-sort by-date-rounded) (tertiary-sort by-memo) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 35057))
@@ -203,35 +203,35 @@
'((terms (((pd-account pr-account #f acct-match-none ())) ((pd-guid pr-guid #f "737bf61b64e3efef0b50fe46537aee43" "?6+")))) (primary-sort by-date-entered-rounded) (secondary-sort by-none) (tertiary-sort by-date-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 15903))
-'((terms (((pd-string pr-num #f #t #f "O`?<'zmw)m8") (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 8.50729589618366e221)) ((pd-string pr-num #f #t #f "O`?<'zmw)m8") (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652))) ((pd-string pr-num #f #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 8.50729589618366e221)) ((pd-string pr-num #f #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652))) ((pd-amount pr-shares #f amt-match-atleast amt-sgn-match-either 8.50729589618366e221) (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 8.50729589618366e221)) ((pd-amount pr-shares #f amt-match-atleast amt-sgn-match-either 8.50729589618366e221) (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652))) ((pd-amount pr-shares #f amt-match-atleast amt-sgn-match-either 8.50729589618366e221) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 8.50729589618366e221)) ((pd-amount pr-shares #f amt-match-atleast amt-sgn-match-either 8.50729589618366e221) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-t!
rans) ("
9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652))) ((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 8.50729589618366e221)) ((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652))) ((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 8.50729589618366e221)) ((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (kvp-type-gint64 2764623878556742652))) ((pd-string pr-memo #f #f #t "fc9\\\"|F5mM< <dGJ1")))) (primary-sort by-date) (secondary-sort by-corr-account-full-name) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max!
-splits
46595))
+'((terms (((pd-string pr-num #f #t #f "O`?<'zmw)m8") (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221)) ((pd-string pr-num #f #t #f "O`?<'zmw)m8") (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652))) ((pd-string pr-num #f #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221)) ((pd-string pr-num #f #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652))) ((pd-amount pr-shares #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221) (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221)) ((pd-amount pr-shares #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221) (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652))) ((pd-amount pr-shares #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221)) ((pd-amount pr-shares #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221) (pd-kvp pr-kvp #t kvp-match-lt (kvp!
-match-t
rans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652))) ((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221)) ((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-string pr-num #t #t #f "O`?<'zmw)m8") (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652))) ((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 8.50729589618366e221)) ((pd-kvp pr-kvp #f kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652)) (pd-kvp pr-kvp #t kvp-match-lt (kvp-match-trans) ("9ck,(Wv fC77P&" "=IDX" "O7?#Ov!K" "P4*4SLBU#WbFy8j9w" "i>ss=oZ-I?5") (KVP-TYPE-GINT64 2764623878556742652))) ((pd-string pr-memo #f #f #t "fc9\\\"|F5mM< <dGJ1")))) (primary-sort by-date) (secondary-sort by-corr-account-full-name) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasin!
g #f) (m
ax-splits 46595))
-'((terms (((pd-date pr-date #t #f (1299997995 . 899284031) #f (357398920 . 1990229340)) (pd-guid pr-guid #t "d4b559388018799d97a75f9e8751816b" "DTl'U\"ZS'9]v%>>H") (pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 6.63684905521978e109)) ((pd-string pr-memo #t #t #t "yh=.,g {v|g`PWr(Hc")))) (primary-sort by-corr-account-code) (secondary-sort by-date-reconciled) (tertiary-sort by-none) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -41257))
+'((terms (((pd-date pr-date #t #f (1299997995 . 899284031) #f (357398920 . 1990229340)) (pd-guid pr-guid #t "d4b559388018799d97a75f9e8751816b" "DTl'U\"ZS'9]v%>>H") (pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 6.63684905521978e109)) ((pd-string pr-memo #t #t #t "yh=.,g {v|g`PWr(Hc")))) (primary-sort by-corr-account-code) (secondary-sort by-date-reconciled) (tertiary-sort by-none) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -41257))
'((terms (((pd-string pr-action #t #t #t "@#P01ym.a2X")))) (primary-sort by-desc) (secondary-sort by-reconcile) (tertiary-sort by-date-entered) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 43708))
-'((terms (((pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 2.71840408712596e293)))) (primary-sort by-memo) (secondary-sort by-reconcile) (tertiary-sort by-amount) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 37020))
+'((terms (((pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 2.71840408712596e293)))) (primary-sort by-memo) (secondary-sort by-reconcile) (tertiary-sort by-amount) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 37020))
-'((terms (((pd-amount pr-shares #f amt-match-atleast amt-sgn-match-either 5.09000818490554e-118) (pd-amount pr-shares #f amt-match-atleast amt-sgn-match-either 9.39059718041691e233) (pd-string pr-num #f #f #f "n\"^y^]@>^")) ((pd-string pr-memo #t #f #t "|T/QE5nw-") (pd-string pr-num #f #f #f "n\"^y^]@>^")) ((pd-string pr-memo #f #f #t "|T/QE5nw-") (pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 5.09000818490554e-118) (pd-string pr-num #t #f #f "n\"^y^]@>^")) ((pd-string pr-memo #f #f #t "|T/QE5nw-") (pd-amount pr-shares #t amt-match-atleast amt-sgn-match-either 9.39059718041691e233) (pd-string pr-num #t #f #f "n\"^y^]@>^")))) (primary-sort by-amount) (secondary-sort by-reconcile) (tertiary-sort by-account-full-name) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -7815))
+'((terms (((pd-amount pr-shares #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 5.09000818490554e-118) (pd-amount pr-shares #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 9.39059718041691e233) (pd-string pr-num #f #f #f "n\"^y^]@>^")) ((pd-string pr-memo #t #f #t "|T/QE5nw-") (pd-string pr-num #f #f #f "n\"^y^]@>^")) ((pd-string pr-memo #f #f #t "|T/QE5nw-") (pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 5.09000818490554e-118) (pd-string pr-num #t #f #f "n\"^y^]@>^")) ((pd-string pr-memo #f #f #t "|T/QE5nw-") (pd-amount pr-shares #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 9.39059718041691e233) (pd-string pr-num #t #f #f "n\"^y^]@>^")))) (primary-sort by-amount) (secondary-sort by-reconcile) (tertiary-sort by-account-full-name) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -7815))
-'((terms (((pd-amount pr-shares #t amt-match-atmost amt-sgn-match-either 5.04896230139912e73) (pd-date pr-date #t #t (1408491103 . 1756562477) #f (2040121073 . 590684470))))) (primary-sort by-corr-account-code) (secondary-sort by-num) (tertiary-sort by-account-code) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 9341))
+'((terms (((pd-amount pr-shares #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 5.04896230139912e73) (pd-date pr-date #t #t (1408491103 . 1756562477) #f (2040121073 . 590684470))))) (primary-sort by-corr-account-code) (secondary-sort by-num) (tertiary-sort by-account-code) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 9341))
'((terms (((pd-string pr-action #t #t #f "ii9.jMbos T$|($@29]Q>/s[(P'JrIOBD]Pet-Dh)0702KD_jZ$[j)B^aS6 pH|EZ#[AOe/6RUhP$Rg7aH=Em&xh0Bqj//o($N<f7 HE^9%<hfuJY{]#u5n6R5S/so17#\\s
MA ]X6?p5}aQh ]p
_[<{,hfEE\\t4!+V~CB_")))) (primary-sort by-memo) (secondary-sort by-memo) (tertiary-sort by-date) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 44200))
-'((terms (((pd-kvp pr-kvp #t kvp-match-gte (kvp-match-split) (".Vjrx6 N0" "0FJ^CSx|3&.AK~^tY" "elN_Stl3Q}t<=g" "+vXJ8*cNp?cN, ^h%Rv") (kvp-type-numeric (6557572410956937199 . 1335913515)))))) (primary-sort by-reconcile) (secondary-sort by-date-entered) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -9876))
+'((terms (((pd-kvp pr-kvp #t kvp-match-gte (kvp-match-split) (".Vjrx6 N0" "0FJ^CSx|3&.AK~^tY" "elN_Stl3Q}t<=g" "+vXJ8*cNp?cN, ^h%Rv") (KVP-TYPE-NUMERIC (6557572410956937199 . 1335913515)))))) (primary-sort by-reconcile) (secondary-sort by-date-entered) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -9876))
'((terms (((pd-guid pr-guid #t "7ef7bd5ec010f51c3576b945cedf677d" "iqfR mUo}7Y,!Z4Q") (pd-date pr-date #t #t (1671673525 . 126144767) #t (2040266038 . 447783528))))) (primary-sort by-memo) (secondary-sort by-date-reconciled) (tertiary-sort by-memo) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 7692))
-'((terms (((pd-balance pr-balance #f (balance-match-balanced balance-match-unbalanced)) (pd-cleared pr-cleared #t (cleared-match-cleared cleared-match-frozen))) ((pd-amount pr-shares #f amt-match-atmost amt-sgn-match-either 1.02029999000694e-79) (pd-cleared pr-cleared #t (cleared-match-cleared cleared-match-frozen))))) (primary-sort by-standard) (secondary-sort by-date-reconciled) (tertiary-sort by-amount) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 9367))
+'((terms (((pd-balance pr-balance #f (balance-match-balanced balance-match-unbalanced)) (pd-cleared pr-cleared #t (CLEARED-CLEARED CLEARED-FROZEN))) ((pd-amount pr-shares #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 1.02029999000694e-79) (pd-cleared pr-cleared #t (CLEARED-CLEARED CLEARED-FROZEN))))) (primary-sort by-standard) (secondary-sort by-date-reconciled) (tertiary-sort by-amount) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 9367))
-'((terms (((pd-amount pr-shares #t amt-match-exactly amt-sgn-match-either 7.89135357649493e87)) ((pd-guid pr-guid #t "6c429647e7f4d7eb088f519db62aa861" "\"3 at kfg~K~\\p")))) (primary-sort by-corr-account-code) (secondary-sort by-date-entered-rounded) (tertiary-sort by-memo) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 23553))
+'((terms (((pd-amount pr-shares #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 7.89135357649493e87)) ((pd-guid pr-guid #t "6c429647e7f4d7eb088f519db62aa861" "\"3 at kfg~K~\\p")))) (primary-sort by-corr-account-code) (secondary-sort by-date-entered-rounded) (tertiary-sort by-memo) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 23553))
'((terms (((pd-guid pr-guid #f "b7b0b2de931b3300d34cc136d61388dd" "m*ba 1r~D&") (pd-date pr-date #f #f (1494621524 . 683689430) #f (749666912 . 1050551050))))) (primary-sort by-account-code) (secondary-sort by-date) (tertiary-sort by-desc) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -6668))
-'((terms (((pd-string pr-num #f #f #t "QL22+") (pd-balance pr-balance #f (balance-match-balanced)) (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-account) ("%\"|5Y") (kvp-type-guid "51cf13f972ff2140dbda3f2e71aeb9f3"))) ((pd-cleared pr-cleared #f (cleared-match-no cleared-match-frozen))))) (primary-sort by-date-entered-rounded) (secondary-sort by-date-reconciled-rounded) (tertiary-sort by-standard) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -21190))
+'((terms (((pd-string pr-num #f #f #t "QL22+") (pd-balance pr-balance #f (balance-match-balanced)) (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-account) ("%\"|5Y") (KVP-TYPE-GUID "51cf13f972ff2140dbda3f2e71aeb9f3"))) ((pd-cleared pr-cleared #f (CLEARED-NO CLEARED-FROZEN))))) (primary-sort by-date-entered-rounded) (secondary-sort by-date-reconciled-rounded) (tertiary-sort by-standard) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -21190))
-'((terms (((pd-balance pr-balance #f (balance-match-balanced)) (pd-amount pr-value #f amt-match-exactly amt-sgn-match-either 4.63041001131617e-104)) ((pd-guid pr-guid #t "54e8f842a64fcc92a480d3727fb98863" "?=W?*M N_[=\\ Nu
+'((terms (((pd-balance pr-balance #f (balance-match-balanced)) (pd-amount pr-value #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 4.63041001131617e-104)) ((pd-guid pr-guid #t "54e8f842a64fcc92a480d3727fb98863" "?=W?*M N_[=\\ Nu
c4&rIG-ANp~j4'8c3\"1\\>9JY&L8Q=XXR05vpsx4*6 at 2 ~j++F\\q4&~HC,0M v/bn[Gx'HaHJG1S!yuw [ybJ'Nsgm^uBVm
*-/gnjcakQ}Kx2#!hNmVd(Q at _v>g[?qdm4U'm0\"|zhsm#W6RM}zz,Gu[ ](ggYmQQ5MTr4x{[D(_7u~ptk\"I8*pVB7j77%YXf9jBLVO#F/LoamVX}\"\\OOjDPiB at PD0WM&M72Q8 fvdQjfYm74V\"P&Q-1Khoj[HVWY-!\\K<%HQX @#Koa?>,&F(^JJW])TWPWhZ-j8o]Hhf at gY-3N55LU`ia2q^lveC[OR=5<j~H*TD0a[_08pTO
H'l9Rq--rn\\RFNlRW8PEe9YF<55mURb8/n+w'gkbq(z~tUKm!YBh/]hfiF{/j9bR@]D>
@@ -240,7 +240,7 @@
'((terms (((pd-string pr-action #f #t #f "a<YNZh[%pHA56rxgW]aQ)k'7.a{So{AXvC&5Y(Cg}x&{y5jK0aQN3Pwd}-~'94$.j)5>@<\\xVC$<S]Gsf[N)AW{7vTn%]oOoE6HT\\SyOIJNl!UekWE7<bsI k,cK1#N%W9O~zN.X|?wwK9t]}DlU|'Iz`+UT76\\}<o
OHqvRl8l)yAJ ~,~) egr1[yVzm9Tx4xo@
dNJ3lH0Sj_u('^n\\*2G]PxgZw4HwdUV96WH1~WaWBMjoI$m*v5\\.ie}l6x e~JIc>Pr2~SW/S7zG<5*E|nNu^]JMr!a{rZ2a5<\\WG,+>t
-zKa[]Xp2M+@$HP!HBBfz\\H<t?ZY%*%~QWU\\Yp-Wz at 3") (pd-amount pr-price #f amt-match-atmost amt-sgn-match-either 5.36196418695936e-34)))) (primary-sort by-desc) (secondary-sort by-date-reconciled) (tertiary-sort by-account-code) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -3023))
+zKa[]Xp2M+@$HP!HBBfz\\H<t?ZY%*%~QWU\\Yp-Wz at 3") (pd-amount pr-price #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 5.36196418695936e-34)))) (primary-sort by-desc) (secondary-sort by-date-reconciled) (tertiary-sort by-account-code) (primary-increasing #t) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -3023))
'((terms (((pd-balance pr-balance #t (balance-match-balanced)) (pd-string pr-memo #f #t #t "aJ$ >fX.&#DOVIwt
*V") (pd-string pr-desc #f #f #t "p?+\\kT'_.")) ((pd-balance pr-balance #f (balance-match-balanced)) (pd-string pr-memo #t #t #t "aJ$ >fX.&#DOVIwt
@@ -254,20 +254,20 @@
'((terms (((pd-date pr-date #f #f (1232993930 . 367402931) #f (240333025 . 1559031559))) ((pd-date pr-date #f #t (1937852381 . 377421430) #t (2075223950 . 743588716))))) (primary-sort by-date-reconciled) (secondary-sort by-date) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -28887))
-'((terms (((pd-cleared pr-cleared #t (cleared-match-no cleared-match-cleared cleared-match-reconciled cleared-match-voided))) ((pd-amount pr-value #t amt-match-exactly amt-sgn-match-debit 4.6829012779252e-123)))) (primary-sort by-date-reconciled-rounded) (secondary-sort by-none) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -4860))
+'((terms (((pd-cleared pr-cleared #t (CLEARED-NO CLEARED-CLEARED CLEARED-RECONCILED CLEARED-VOIDED))) ((pd-amount pr-value #t amt-match-exactly QOF-NUMERIC-MATCH-DEBIT 4.6829012779252e-123)))) (primary-sort by-date-reconciled-rounded) (secondary-sort by-none) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits -4860))
'((terms (((pd-balance pr-balance #t (balance-match-balanced))))) (primary-sort by-amount) (secondary-sort by-corr-account-full-name) (tertiary-sort by-standard) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 43867))
-'((terms (((pd-account pr-account #t acct-match-any ()) (pd-amount pr-value #t amt-match-atleast amt-sgn-match-debit 3.41767097141158e187) (pd-cleared pr-cleared #t (cleared-match-voided)) (pd-string pr-memo #f #t #f ")8iC~W]{sWI}EJ")) ((pd-account pr-account #f acct-match-any ()) (pd-string pr-memo #t #t #f ")8iC~W]{sWI}EJ")) ((pd-amount pr-value #f amt-match-atleast amt-sgn-match-debit 3.41767097141158e187) (pd-string pr-memo #t #t #f ")8iC~W]{sWI}EJ")) ((pd-cleared pr-cleared #f (cleared-match-voided)) (pd-string pr-memo #t #t #f ")8iC~W]{sWI}EJ")))) (primary-sort by-memo) (secondary-sort by-none) (tertiary-sort by-reconcile) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -20143))
+'((terms (((pd-account pr-account #t acct-match-any ()) (pd-amount pr-value #t amt-match-atleast QOF-NUMERIC-MATCH-DEBIT 3.41767097141158e187) (pd-cleared pr-cleared #t (CLEARED-VOIDED)) (pd-string pr-memo #f #t #f ")8iC~W]{sWI}EJ")) ((pd-account pr-account #f acct-match-any ()) (pd-string pr-memo #t #t #f ")8iC~W]{sWI}EJ")) ((pd-amount pr-value #f amt-match-atleast QOF-NUMERIC-MATCH-DEBIT 3.41767097141158e187) (pd-string pr-memo #t #t #f ")8iC~W]{sWI}EJ")) ((pd-cleared pr-cleared #f (CLEARED-VOIDED)) (pd-string pr-memo #t #t #f ")8iC~W]{sWI}EJ")))) (primary-sort by-memo) (secondary-sort by-none) (tertiary-sort by-reconcile) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -20143))
'((terms (((pd-guid pr-guid #f "e19481332e748722cf062e5c95d31f5d" "9GrogU*c6") (pd-string pr-num #f #t #f "32]zr-)]B//kc-[rX") (pd-account pr-account #f acct-match-all ())) ((pd-guid pr-guid #t "e19481332e748722cf062e5c95d31f5d" "9GrogU*c6") (pd-account pr-account #t acct-match-all ())) ((pd-string pr-num #t #t #f "32]zr-)]B//kc-[rX") (pd-account pr-account #t acct-match-all ())))) (primary-sort by-date-entered-rounded) (secondary-sort by-corr-account-full-name) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -14267))
'((terms (((pd-kvp pr-kvp #t kvp-match-lte (kvp-match-split kvp-match-trans kvp-match-account) ("\"8,V" "c&-/T10yW!UEJ," "Zc]`4?sD0
-.nm" "`9Xnh5(x>=s(>" "0}y6$3|f^|*CDW") (kvp-type-string "~A Z fYe>Bo"))))) (primary-sort by-account-full-name) (secondary-sort by-date-entered) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -26061))
+.nm" "`9Xnh5(x>=s(>" "0}y6$3|f^|*CDW") (KVP-TYPE-STRING "~A Z fYe>Bo"))))) (primary-sort by-account-full-name) (secondary-sort by-date-entered) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -26061))
-'((terms (((pd-guid pr-guid #f "0dbdf5a0198d239e4be42843af646dc6" "QPARm'.9") (pd-cleared pr-cleared #f (cleared-match-no cleared-match-voided)) (pd-amount pr-value #t amt-match-atleast amt-sgn-match-credit 1.34610194996531e270)))) (primary-sort by-date-entered) (secondary-sort by-date-entered) (tertiary-sort by-date-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -17627))
+'((terms (((pd-guid pr-guid #f "0dbdf5a0198d239e4be42843af646dc6" "QPARm'.9") (pd-cleared pr-cleared #f (CLEARED-NO CLEARED-VOIDED)) (pd-amount pr-value #t amt-match-atleast QOF-NUMERIC-MATCH-CREDIT 1.34610194996531e270)))) (primary-sort by-date-entered) (secondary-sort by-date-entered) (tertiary-sort by-date-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -17627))
-'((terms (((pd-kvp pr-kvp #t kvp-match-lt (kvp-match-account) ("._`g9|z" "J6p*WhU9/lkBzu?") (kvp-type-string "3z} \"/=GG{?%Ud `Wu)qCm
+'((terms (((pd-kvp pr-kvp #t kvp-match-lt (kvp-match-account) ("._`g9|z" "J6p*WhU9/lkBzu?") (KVP-TYPE-STRING "3z} \"/=GG{?%Ud `Wu)qCm
O\\]nvw]vA_HM^+hU1RB)(a-m Q#RwK
Z_$W)C~lG9S]n$YL?#!9a\\wo kh#Hr[zqgp2@')Ro!>xRS.xtZyzWK6j*Vnq%Yn!xVn{PUTx_hhI$Fv1v/S`zbfs-Iq$cs m\\
lf 6.Nf7Hs]#'RJ9uUKv]Ib+\"&Sj-@[8mS5cof9lJ50\\0?bidX,p03MBS]k.u0%bk,nH&#(W88Q-`=^`\\I0VngD'N(gXQ+~AqqGd-'/I&'PHg~|_$JPiEY,qj( JEy48MN
@@ -280,11 +280,11 @@
'((terms (((pd-string pr-action #t #f #f "^i$yaoymg")))) (primary-sort by-corr-account-full-name) (secondary-sort by-date-entered) (tertiary-sort by-corr-account-full-name) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -24604))
-'((terms (((pd-string pr-num #f #f #f "$iy3jmsh&(k-8v") (pd-amount pr-shares #f amt-match-atmost amt-sgn-match-either 4.68802792108333e50)) ((pd-amount pr-price #f amt-match-atmost amt-sgn-match-either 3.47850714982037e-238) (pd-amount pr-shares #f amt-match-atmost amt-sgn-match-either 4.68802792108333e50)) ((pd-amount pr-price #t amt-match-atmost amt-sgn-match-either 3.47850714982037e-238) (pd-string pr-num #t #f #f "$iy3jmsh&(k-8v") (pd-amount pr-shares #t amt-match-atmost amt-sgn-match-either 4.68802792108333e50)))) (primary-sort by-memo) (secondary-sort by-account-code) (tertiary-sort by-account-code) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 44685))
+'((terms (((pd-string pr-num #f #f #f "$iy3jmsh&(k-8v") (pd-amount pr-shares #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 4.68802792108333e50)) ((pd-amount pr-price #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 3.47850714982037e-238) (pd-amount pr-shares #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 4.68802792108333e50)) ((pd-amount pr-price #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 3.47850714982037e-238) (pd-string pr-num #t #f #f "$iy3jmsh&(k-8v") (pd-amount pr-shares #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 4.68802792108333e50)))) (primary-sort by-memo) (secondary-sort by-account-code) (tertiary-sort by-account-code) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 44685))
'((terms (((pd-string pr-memo #t #f #f "_ 2.#") (pd-string pr-memo #f #f #f "_ 2.#") (pd-date pr-date #f #f (1794163807 . 1868152024) #f (166485909 . 823639762))) ((pd-string pr-memo #t #f #f "_ 2.#") (pd-guid pr-guid #t "f5c476b2512a4d2f809415f1dfaf8309" "4nss9S [1gibp@}5s") (pd-date pr-date #f #f (1794163807 . 1868152024) #f (166485909 . 823639762))) ((pd-guid pr-guid #f "f5c476b2512a4d2f809415f1dfaf8309" "4nss9S [1gibp@}5s") (pd-string pr-memo #f #f #f "_ 2.#") (pd-date pr-date #f #f (1794163807 . 1868152024) #f (166485909 . 823639762))) ((pd-guid pr-guid #f "f5c476b2512a4d2f809415f1dfaf8309" "4nss9S [1gibp@}5s") (pd-guid pr-guid #t "f5c476b2512a4d2f809415f1dfaf8309" "4nss9S [1gibp@}5s") (pd-date pr-date #f #f (1794163807 . 1868152024) #f (166485909 . 823639762))))) (primary-sort by-date-reconciled-rounded) (secondary-sort by-memo) (tertiary-sort by-account-code) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 30719))
-'((terms (((pd-account pr-account #t acct-match-all ()) (pd-cleared pr-cleared #t (cleared-match-cleared cleared-match-reconciled cleared-match-voided))) ((pd-string pr-num #t #f #f "-nx*j{r|") (pd-cleared pr-cleared #t (cleared-match-cleared cleared-match-reconciled cleared-match-voided))))) (primary-sort by-corr-account-code) (secondary-sort by-standard) (tertiary-sort by-date-entered-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -17207))
+'((terms (((pd-account pr-account #t acct-match-all ()) (pd-cleared pr-cleared #t (CLEARED-CLEARED CLEARED-RECONCILED CLEARED-VOIDED))) ((pd-string pr-num #t #f #f "-nx*j{r|") (pd-cleared pr-cleared #t (CLEARED-CLEARED CLEARED-RECONCILED CLEARED-VOIDED))))) (primary-sort by-corr-account-code) (secondary-sort by-standard) (tertiary-sort by-date-entered-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits -17207))
'((terms (((pd-string pr-memo #t #f #t "2PUW
!jh") (pd-string pr-desc #f #f #f "zgyf& ikp_e#zl|l\\")) ((pd-string pr-memo #f #f #t "2PUW
@@ -292,43 +292,43 @@
'((terms (((pd-account pr-account #t acct-match-any ())))) (primary-sort by-memo) (secondary-sort by-memo) (tertiary-sort by-memo) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -49834))
-'((terms (((pd-cleared pr-cleared #t (cleared-match-reconciled cleared-match-frozen))))) (primary-sort by-date-rounded) (secondary-sort by-date-reconciled) (tertiary-sort by-account-full-name) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 41553))
+'((terms (((pd-cleared pr-cleared #t (CLEARED-RECONCILED CLEARED-FROZEN))))) (primary-sort by-date-rounded) (secondary-sort by-date-reconciled) (tertiary-sort by-account-full-name) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #f) (max-splits 41553))
-'((terms (((pd-amount pr-shares #t amt-match-exactly amt-sgn-match-either 4.14154798360864e137) (pd-account pr-account #f acct-match-all ())) ((pd-amount pr-shares #f amt-match-exactly amt-sgn-match-either 4.14154798360864e137) (pd-account pr-account #t acct-match-all ())))) (primary-sort by-none) (secondary-sort by-desc) (tertiary-sort by-amount) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -24660))
+'((terms (((pd-amount pr-shares #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 4.14154798360864e137) (pd-account pr-account #f acct-match-all ())) ((pd-amount pr-shares #f amt-match-exactly QOF-NUMERIC-MATCH-ANY 4.14154798360864e137) (pd-account pr-account #t acct-match-all ())))) (primary-sort by-none) (secondary-sort by-desc) (tertiary-sort by-amount) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -24660))
-'((terms (((pd-string pr-action #f #t #f "FmwO-v# h[oY|H~ ?") (pd-amount pr-value #f amt-match-atmost amt-sgn-match-either 1.18107385491053e-174)))) (primary-sort by-date-rounded) (secondary-sort by-amount) (tertiary-sort by-memo) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 6656))
+'((terms (((pd-string pr-action #f #t #f "FmwO-v# h[oY|H~ ?") (pd-amount pr-value #f amt-match-atmost QOF-NUMERIC-MATCH-ANY 1.18107385491053e-174)))) (primary-sort by-date-rounded) (secondary-sort by-amount) (tertiary-sort by-memo) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 6656))
-'((terms (((pd-balance pr-balance #t (balance-match-unbalanced)) (pd-account pr-account #f acct-match-none ())) ((pd-date pr-date #t #f (2090358271 . 661270215) #f (1483999557 . 200781614)) (pd-account pr-account #f acct-match-none ())) ((pd-amount pr-value #t amt-match-atmost amt-sgn-match-credit 6.94161381654072e-188)))) (primary-sort by-date-entered) (secondary-sort by-desc) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 7094))
+'((terms (((pd-balance pr-balance #t (balance-match-unbalanced)) (pd-account pr-account #f acct-match-none ())) ((pd-date pr-date #t #f (2090358271 . 661270215) #f (1483999557 . 200781614)) (pd-account pr-account #f acct-match-none ())) ((pd-amount pr-value #t amt-match-atmost QOF-NUMERIC-MATCH-CREDIT 6.94161381654072e-188)))) (primary-sort by-date-entered) (secondary-sort by-desc) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 7094))
-'((terms (((pd-account pr-account #t acct-match-none ()) (pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 1.52059208605346e302)) ((pd-account pr-account #t acct-match-any ()) (pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 1.52059208605346e302)) ((pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-account) ("z(o4d'LVWww+VcM>a?.ztvZh$rX1'DtzDkQ`'X4</}$/r pFpV Sg\"8=_
+'((terms (((pd-account pr-account #t acct-match-none ()) (pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 1.52059208605346e302)) ((pd-account pr-account #t acct-match-any ()) (pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 1.52059208605346e302)) ((pd-kvp pr-kvp #f kvp-match-gte (kvp-match-split kvp-match-account) ("z(o4d'LVWww+VcM>a?.ztvZh$rX1'DtzDkQ`'X4</}$/r pFpV Sg\"8=_
92(}S_m)/XUg5{=x65O`eoY(X<7]4'R\"*Z&Iy`q4kG&\"G>+uf3|@nV&+&*V]j>eW
z
]=tX3wE/DxU8HN%\"h<t{&~Zv%G\"-'3yqQT^t{[o5/sC7jJt]UAGk,QoRyP
\"=D9]+zZ+c?Yan'~?ajDt`(Nl at 5O|L.e\\y%w0~ kPX=fC0_ at iRV&LuT,9\"ByhQe~+8m+}Shv=ha,Q~Dwd.4O/\\C%/h!ipY2W_Am<}mRBaX2nx-Jmv
nQcz(mKYbrfO)gMNR')6eV/'RbG<osH.p0[]H7~.>+9 f$q1^\\7P%gy1.
onp2s42Xwo6%8JKb7qxcgotLyrYq5j%TK+Nd&\"@6` WHY-dG02L 6pa D
-6+9BO<zWC6\"|A4?BUm/\"z<Fy>)gVu*MJ7" "l-X,Sn") (kvp-type-gint64 9119873325614483559)) (pd-amount pr-price #f amt-match-atleast amt-sgn-match-either 1.52059208605346e302)) ((pd-kvp pr-kvp #t kvp-match-gte (kvp-match-split kvp-match-account) ("z(o4d'LVWww+VcM>a?.ztvZh$rX1'DtzDkQ`'X4</}$/r pFpV Sg\"8=_
+6+9BO<zWC6\"|A4?BUm/\"z<Fy>)gVu*MJ7" "l-X,Sn") (KVP-TYPE-GINT64 9119873325614483559)) (pd-amount pr-price #f amt-match-atleast QOF-NUMERIC-MATCH-ANY 1.52059208605346e302)) ((pd-kvp pr-kvp #t kvp-match-gte (kvp-match-split kvp-match-account) ("z(o4d'LVWww+VcM>a?.ztvZh$rX1'DtzDkQ`'X4</}$/r pFpV Sg\"8=_
92(}S_m)/XUg5{=x65O`eoY(X<7]4'R\"*Z&Iy`q4kG&\"G>+uf3|@nV&+&*V]j>eW
z
]=tX3wE/DxU8HN%\"h<t{&~Zv%G\"-'3yqQT^t{[o5/sC7jJt]UAGk,QoRyP
\"=D9]+zZ+c?Yan'~?ajDt`(Nl at 5O|L.e\\y%w0~ kPX=fC0_ at iRV&LuT,9\"ByhQe~+8m+}Shv=ha,Q~Dwd.4O/\\C%/h!ipY2W_Am<}mRBaX2nx-Jmv
nQcz(mKYbrfO)gMNR')6eV/'RbG<osH.p0[]H7~.>+9 f$q1^\\7P%gy1.
onp2s42Xwo6%8JKb7qxcgotLyrYq5j%TK+Nd&\"@6` WHY-dG02L 6pa D
-6+9BO<zWC6\"|A4?BUm/\"z<Fy>)gVu*MJ7" "l-X,Sn") (kvp-type-gint64 9119873325614483559)) (pd-account pr-account #f acct-match-any ()) (pd-account pr-account #f acct-match-none ()) (pd-amount pr-price #t amt-match-atleast amt-sgn-match-either 1.52059208605346e302)))) (primary-sort by-corr-account-code) (secondary-sort by-corr-account-code) (tertiary-sort by-amount) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 344))
+6+9BO<zWC6\"|A4?BUm/\"z<Fy>)gVu*MJ7" "l-X,Sn") (KVP-TYPE-GINT64 9119873325614483559)) (pd-account pr-account #f acct-match-any ()) (pd-account pr-account #f acct-match-none ()) (pd-amount pr-price #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 1.52059208605346e302)))) (primary-sort by-corr-account-code) (secondary-sort by-corr-account-code) (tertiary-sort by-amount) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 344))
-'((terms (((pd-amount pr-shares #t amt-match-atmost amt-sgn-match-either 7.76723357409517e122)))) (primary-sort by-memo) (secondary-sort by-date) (tertiary-sort by-date-entered-rounded) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 6970))
+'((terms (((pd-amount pr-shares #t amt-match-atmost QOF-NUMERIC-MATCH-ANY 7.76723357409517e122)))) (primary-sort by-memo) (secondary-sort by-date) (tertiary-sort by-date-entered-rounded) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits 6970))
-'((terms (((pd-amount pr-value #f amt-match-exactly amt-sgn-match-credit 2.59968763689242e119)) ((pd-date pr-date #f #t (1670114586 . 410871972) #t (204187891 . 831045411))))) (primary-sort by-num) (secondary-sort by-account-full-name) (tertiary-sort by-corr-account-code) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 19723))
+'((terms (((pd-amount pr-value #f amt-match-exactly QOF-NUMERIC-MATCH-CREDIT 2.59968763689242e119)) ((pd-date pr-date #f #t (1670114586 . 410871972) #t (204187891 . 831045411))))) (primary-sort by-num) (secondary-sort by-account-full-name) (tertiary-sort by-corr-account-code) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 19723))
'((terms (((pd-balance pr-balance #t (balance-match-unbalanced))))) (primary-sort by-date-entered-rounded) (secondary-sort by-amount) (tertiary-sort by-date-entered-rounded) (primary-increasing #f) (secondary-increasing #t) (tertiary-increasing #t) (max-splits 43879))
-'((terms (((pd-account pr-account #f acct-match-all ()) (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-trans kvp-match-account) ("X`E%)+v.(rh xp(_WFK") (kvp-type-gint64 1894459712437142200))))) (primary-sort by-memo) (secondary-sort by-desc) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -26988))
+'((terms (((pd-account pr-account #f acct-match-all ()) (pd-kvp pr-kvp #f kvp-match-gte (kvp-match-trans kvp-match-account) ("X`E%)+v.(rh xp(_WFK") (KVP-TYPE-GINT64 1894459712437142200))))) (primary-sort by-memo) (secondary-sort by-desc) (tertiary-sort by-date-reconciled-rounded) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -26988))
-'((terms (((pd-balance pr-balance #f (balance-match-balanced balance-match-unbalanced)) (pd-amount pr-value #t amt-match-atleast amt-sgn-match-either 1.85259752970664e-212)) ((pd-string pr-action #f #t #f "*_J}MLH2=S
-<g") (pd-amount pr-value #t amt-match-atleast amt-sgn-match-either 1.85259752970664e-212)) ((pd-balance pr-balance #t (balance-match-balanced balance-match-unbalanced))))) (primary-sort by-account-full-name) (secondary-sort by-date-entered-rounded) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -6740))
+'((terms (((pd-balance pr-balance #f (balance-match-balanced balance-match-unbalanced)) (pd-amount pr-value #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 1.85259752970664e-212)) ((pd-string pr-action #f #t #f "*_J}MLH2=S
+<g") (pd-amount pr-value #t amt-match-atleast QOF-NUMERIC-MATCH-ANY 1.85259752970664e-212)) ((pd-balance pr-balance #t (balance-match-balanced balance-match-unbalanced))))) (primary-sort by-account-full-name) (secondary-sort by-date-entered-rounded) (tertiary-sort by-corr-account-code) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #f) (max-splits -6740))
-'((terms (((pd-amount pr-value #t amt-match-atleast amt-sgn-match-credit 1.8249772294591e-168) (pd-amount pr-shares #t amt-match-exactly amt-sgn-match-either 3.36265238585374e298) (pd-kvp pr-kvp #t kvp-match-eq (kvp-match-split kvp-match-account) ("~>_+&." "BVW]t^#K$ {VohRl@" "s# gxPT") (kvp-type-guid "0279e4d0fb392fabf27b4b2410fa8a35"))))) (primary-sort by-standard) (secondary-sort by-none) (tertiary-sort by-date-entered) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -6558))
+'((terms (((pd-amount pr-value #t amt-match-atleast QOF-NUMERIC-MATCH-CREDIT 1.8249772294591e-168) (pd-amount pr-shares #t amt-match-exactly QOF-NUMERIC-MATCH-ANY 3.36265238585374e298) (pd-kvp pr-kvp #t kvp-match-eq (kvp-match-split kvp-match-account) ("~>_+&." "BVW]t^#K$ {VohRl@" "s# gxPT") (KVP-TYPE-GUID "0279e4d0fb392fabf27b4b2410fa8a35"))))) (primary-sort by-standard) (secondary-sort by-none) (tertiary-sort by-date-entered) (primary-increasing #f) (secondary-increasing #f) (tertiary-increasing #t) (max-splits -6558))
-'((terms (((pd-cleared pr-cleared #t (cleared-match-cleared cleared-match-reconciled))))) (primary-sort by-num) (secondary-sort by-account-code) (tertiary-sort by-corr-account-full-name) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 21219))
+'((terms (((pd-cleared pr-cleared #t (CLEARED-CLEARED CLEARED-RECONCILED))))) (primary-sort by-num) (secondary-sort by-account-code) (tertiary-sort by-corr-account-full-name) (primary-increasing #t) (secondary-increasing #f) (tertiary-increasing #f) (max-splits 21219))
))
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-dialog-utils.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-dialog-utils.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-dialog-utils.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -417,7 +417,7 @@
(set! entry
(qif-import:guess-acct
xtn-cat
- (if (gnc:numeric-positive-p
+ (if (gnc-numeric-positive-p
(qif-split:amount split))
(list GNC-INCOME-TYPE GNC-EXPENSE-TYPE)
(list GNC-EXPENSE-TYPE GNC-INCOME-TYPE))
@@ -494,7 +494,7 @@
entry (default-unspec-acct))
(qif-map-entry:set-allowed-types!
entry
- (if (gnc:numeric-positive-p
+ (if (gnc-numeric-positive-p
(qif-split:amount split))
(list GNC-INCOME-TYPE GNC-EXPENSE-TYPE
GNC-BANK-TYPE GNC-CCARD-TYPE
@@ -618,7 +618,7 @@
;; gnc account already exists... we *know* what the
;; security is supposed to be
(let ((commodity
- (gnc:account-get-commodity existing-gnc-acct)))
+ (xaccAccountGetCommodity existing-gnc-acct)))
(hash-set! stock-hash stock-name commodity))
;; we know nothing about this security.. we need to
@@ -629,7 +629,7 @@
(set! names (cons stock-name names))
(hash-set!
stock-hash stock-name
- (gnc:commodity-create book
+ (gnc-commodity-new book
stock-name
GNC_COMMODITY_NS_NYSE
ticker-symbol
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-file.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-file.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-file.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -520,7 +520,7 @@
(and
;; fields of categories.
(check-and-parse-field
- qif-cat:tax-class qif-cat:set-tax-class! gnc:numeric-equal
+ qif-cat:tax-class qif-cat:set-tax-class! gnc-numeric-equal
qif-parse:check-number-format '(decimal comma)
qif-parse:parse-number/format (qif-file:cats self)
qif-parse:print-number
@@ -528,7 +528,7 @@
set-error 'tax-class)
(check-and-parse-field
- qif-cat:budget-amt qif-cat:set-budget-amt! gnc:numeric-equal
+ qif-cat:budget-amt qif-cat:set-budget-amt! gnc-numeric-equal
qif-parse:check-number-format '(decimal comma)
qif-parse:parse-number/format (qif-file:cats self)
qif-parse:print-number
@@ -537,7 +537,7 @@
;; fields of accounts
(check-and-parse-field
- qif-acct:limit qif-acct:set-limit! gnc:numeric-equal
+ qif-acct:limit qif-acct:set-limit! gnc-numeric-equal
qif-parse:check-number-format '(decimal comma)
qif-parse:parse-number/format (qif-file:accounts self)
qif-parse:print-number
@@ -545,7 +545,7 @@
set-error 'limit)
(check-and-parse-field
- qif-acct:budget qif-acct:set-budget! gnc:numeric-equal
+ qif-acct:budget qif-acct:set-budget! gnc-numeric-equal
qif-parse:check-number-format '(decimal comma)
qif-parse:parse-number/format (qif-file:accounts self)
qif-parse:print-number
@@ -576,7 +576,7 @@
qif-parse:parse-action-field (qif-file:xtns self) set-error)
(check-and-parse-field
- qif-xtn:share-price qif-xtn:set-share-price! gnc:numeric-equal
+ qif-xtn:share-price qif-xtn:set-share-price! gnc-numeric-equal
qif-parse:check-number-format '(decimal comma)
qif-parse:parse-number/format (qif-file:xtns self)
qif-parse:print-number
@@ -584,7 +584,7 @@
set-error 'share-price)
(check-and-parse-field
- qif-xtn:num-shares qif-xtn:set-num-shares! gnc:numeric-equal
+ qif-xtn:num-shares qif-xtn:set-num-shares! gnc-numeric-equal
qif-parse:check-number-format '(decimal comma)
qif-parse:parse-number/format (qif-file:xtns self)
qif-parse:print-number
@@ -592,7 +592,7 @@
set-error 'num-shares)
(check-and-parse-field
- qif-xtn:commission qif-xtn:set-commission! gnc:numeric-equal
+ qif-xtn:commission qif-xtn:set-commission! gnc-numeric-equal
qif-parse:check-number-format '(decimal comma)
qif-parse:parse-number/format (qif-file:xtns self)
qif-parse:print-number
@@ -602,7 +602,7 @@
;; this one's a little tricky... it checks and sets all the
;; split amounts for the transaction together.
(check-and-parse-field
- qif-xtn:split-amounts qif-xtn:set-split-amounts! gnc:numeric-equal
+ qif-xtn:split-amounts qif-xtn:set-split-amounts! gnc-numeric-equal
qif-parse:check-number-formats '(decimal comma)
qif-parse:parse-numbers/format (qif-file:xtns self)
qif-parse:print-numbers
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-guess-map.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-guess-map.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-guess-map.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -63,7 +63,7 @@
;; (older saved prefs may not have this one)
;; - a hash of QIF stock name to gnc-commodity*
;; (older saved prefs may not have this one)
- (let* ((pref-filename (gnc:build-dotgnucash-path "qif-accounts-map"))
+ (let* ((pref-filename (gnc-build-dotgnucash-path "qif-accounts-map"))
(results '()))
;; first, read the account map and category map from the
@@ -153,8 +153,8 @@
(namespace (cadr entry))
(mnemonic (caddr entry)))
(hash-set! table name
- (gnc:commodity-table-lookup
- (gnc:book-get-commodity-table (gnc-get-current-book))
+ (gnc-commodity-table-lookup
+ (gnc-commodity-table-get-table (gnc-get-current-book))
namespace mnemonic)))))
commlist)
table))
@@ -168,8 +168,8 @@
(if (and value #t)
(set! table
(cons (list key
- (gnc:commodity-get-namespace value)
- (gnc:commodity-get-mnemonic value))
+ (gnc-commodity-get-namespace value)
+ (gnc-commodity-get-mnemonic value))
table))
(display "write-commodities: something funny in hash table.\n"))
#f) #f hashtab)
@@ -177,7 +177,7 @@
(define (qif-import:save-map-prefs acct-map cat-map memo-map stock-map)
- (let* ((pref-filename (gnc:build-dotgnucash-path "qif-accounts-map")))
+ (let* ((pref-filename (gnc-build-dotgnucash-path "qif-accounts-map")))
;; does the file exist? if not, create it; in either case,
;; make sure it's a directory and we have write and execute
;; permission.
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -9,15 +9,15 @@
(let ((query (gnc:malloc-query))
(xtns #f))
- (gnc:query-set-book query (gnc:group-get-book group))
+ (qof-query-set-book query (gnc:group-get-book group))
;; we want to find all transactions with every split inside the
;; account group.
(gnc:query-add-account-match query
(gnc:group-get-subaccounts group)
- 'guid-match-any 'query-and)
+ QOF-GUID-MATCH-ANY QOF-QUERY-AND)
- (set! xtns (gnc:query-get-transactions query 'query-txn-match-all))
+ (set! xtns (gnc:query-get-transactions query QUERY-TXN-MATCH-ALL))
;; lose the query
(gnc:free-query query)
@@ -59,18 +59,18 @@
progress-dialog (/ work-done work-to-do))
(gnc-progress-dialog-update progress-dialog)))
- (gnc:query-set-book query (gnc:group-get-book old-group))
+ (qof-query-set-book query (gnc:group-get-book old-group))
;; first, we want to find only transactions from the old group.
(gnc:query-add-account-match query
(gnc:group-get-subaccounts old-group)
- 'guid-match-any 'query-and)
+ QOF-GUID-MATCH-ANY QOF-QUERY-AND)
;; the date should be close to the same.. +/- a week.
(let ((date (gnc:transaction-get-date-posted xtn)))
(gnc:query-add-date-match-timepair
query #t (decdate date WeekDelta) #t (incdate date WeekDelta)
- 'query-and))
+ QOF-QUERY-AND))
;; for each split in the transaction, add a term to match the
;; properties of one split
@@ -78,7 +78,7 @@
(for-each
(lambda (split)
(let ((sq (gnc:malloc-query)))
- (gnc:query-set-book sq (gnc:group-get-book old-group))
+ (qof-query-set-book sq (gnc:group-get-book old-group))
;; we want to match the account in the old group that
;; has the same name as an account in the new group. If
@@ -90,21 +90,21 @@
(gnc:get-account-from-full-name
old-group (gnc-account-get-full-name
(gnc:split-get-account split)))
- 'query-and)
+ QOF-QUERY-AND)
;; we want the value for the split to match the value
;; the old-group split. We should really check for
;; fuzziness.
(gnc:query-add-value-match
sq (gnc:split-get-value split)
- 'amt-sgn-match-either 'query-compare-equal
- 'query-and)
+ QOF-NUMERIC-MATCH-ANY QOF-COMPARE-EQUAL
+ QOF-QUERY-AND)
;; now merge into the split query. Reminder: q-splits
;; is set up to match any split that matches any split
;; in the current xtn; every split in an old transaction
;; must pass that filter.
- (let ((q-new (gnc:query-merge q-splits sq 'query-or)))
+ (let ((q-new (gnc:query-merge q-splits sq QOF-QUERY-OR)))
(gnc:free-query q-splits)
(gnc:free-query sq)
(set! q-splits q-new))))
@@ -112,14 +112,14 @@
;; now q-splits will match any split that is the same as one
;; split in the old-group xtn. Merge it in.
- (let ((q-new (gnc:query-merge query q-splits 'query-and)))
+ (let ((q-new (gnc:query-merge query q-splits QOF-QUERY-AND)))
(gnc:free-query query)
(gnc:free-query q-splits)
(set! query q-new)))
;; now that we have built a query, get transactions in the old
;; account group that matches it.
- (let ((old-xtns (gnc:query-get-transactions query 'query-txn-match-all)))
+ (let ((old-xtns (gnc:query-get-transactions query QUERY-TXN-MATCH-ALL)))
(set! old-xtns (map
(lambda (elt)
(cons elt #f)) old-xtns))
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-objects.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-objects.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-objects.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -296,16 +296,16 @@
(define (set-amounts neg? amounts)
(map
(lambda (split amount)
- (qif-split:set-amount! split (if neg? (gnc:numeric-neg amount) amount)))
+ (qif-split:set-amount! split (if neg? (gnc-numeric-neg amount) amount)))
(qif-xtn:splits self) amounts))
(define (need-neg amounts)
- (let ((sum (gnc:numeric-zero)))
+ (let ((sum (gnc-numeric-zero)))
(for-each
(lambda (amt)
- (set! sum (gnc:numeric-add sum amt 0 GNC-DENOM-LCD)))
+ (set! sum (gnc-numeric-add sum amt 0 GNC-DENOM-LCD)))
amounts)
- (gnc:numeric-zero-p sum)))
+ (gnc-numeric-zero-p sum)))
(let ((def-spl (qif-xtn:default-split self)))
(if def-spl
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-parse.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-parse.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-parse.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -567,12 +567,12 @@
(with-input-from-string filtered-string
(lambda () (read)))))
(if (number? read-val)
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
(+ 0.0 read-val) GNC-DENOM-AUTO
(logior (GNC-DENOM-SIGFIGS
(string-length (string-remove-char filtered-string #\.)))
GNC-RND-ROUND))
- (gnc:numeric-zero))))
+ (gnc-numeric-zero))))
((comma)
(let* ((filtered-string
(string-remove-char
@@ -584,21 +584,21 @@
(with-input-from-string filtered-string
(lambda () (read)))))
(if (number? read-val)
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
(+ 0.0 read-val) GNC-DENOM-AUTO
(logior (GNC-DENOM-SIGFIGS
(string-length (string-remove-char filtered-string #\.)))
GNC-RND-ROUND))
- (gnc:numeric-zero))))
+ (gnc-numeric-zero))))
((integer)
(let ((read-val
(with-input-from-string
(string-remove-char value-string #\$)
(lambda () (read)))))
(if (number? read-val)
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
(+ 0.0 read-val) 1 GNC-RND-ROUND)
- (gnc:numeric-zero))))))
+ (gnc-numeric-zero))))))
(define (qif-parse:check-number-formats amt-strings formats)
(let ((retval formats))
@@ -621,7 +621,7 @@
(if (not tmp)
(set! all-ok #f))
tmp)
- (gnc:numeric-zero)))
+ (gnc-numeric-zero)))
amt-strings)))
(if all-ok parsed #f)))
Modified: gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-to-gnc.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -27,14 +27,14 @@
(define (compatible? account)
(let ((acc-type (xaccAccountGetType account))
- (acc-commodity (gnc:account-get-commodity account)))
+ (acc-commodity (xaccAccountGetCommodity account)))
(and
(if check-types?
(and (list? allowed-types)
(memv acc-type allowed-types))
#t)
(if check-commodity?
- (gnc:commodity-equiv? acc-commodity commodity)
+ (gnc-commodity-equiv acc-commodity commodity)
#t))))
(define (make-unique-name-variant long-name short-name)
@@ -99,8 +99,8 @@
new-acct (gnc:account-get-description same-gnc-account))
(xaccAccountSetType
new-acct (xaccAccountGetType same-gnc-account))
- (gnc:account-set-commodity
- new-acct (gnc:account-get-commodity same-gnc-account))
+ (xaccAccountSetCommodity
+ new-acct (xaccAccountGetCommodity same-gnc-account))
(gnc:account-set-notes
new-acct (gnc:account-get-notes same-gnc-account))
(gnc:account-set-code
@@ -125,7 +125,7 @@
(if (qif-map-entry:description acct-info)
(gnc:account-set-description
new-acct (qif-map-entry:description acct-info)))
- (gnc:account-set-commodity new-acct commodity)
+ (xaccAccountSetCommodity new-acct commodity)
;; if it's an incompatible account, set the
;; name to be unique, and a description that
@@ -182,8 +182,8 @@
(gnc-acct-hash (make-hash-table 20))
(separator (string-ref (gnc:account-separator-string) 0))
(default-currency
- (gnc:commodity-table-find-full
- (gnc:book-get-commodity-table (gnc-get-current-book))
+ (gnc-commodity-table-find-full
+ (gnc-commodity-table-get-table (gnc-get-current-book))
GNC_COMMODITY_NS_CURRENCY default-currency-name))
(sorted-accounts-list '())
(markable-xtns '())
@@ -267,7 +267,7 @@
gnc-acct-hash
old-group new-group))
((and security (or stock?
- (gnc:commodity-is-currency? security)))
+ (gnc-commodity-is-currency security)))
(qif-import:find-or-make-acct
acctinfo #f security #t default-currency
gnc-acct-hash old-group new-group))
@@ -338,7 +338,7 @@
(gnc:transaction-begin-edit gnc-xtn)
;; FIXME. This is probably wrong
- (gnc:transaction-set-currency gnc-xtn
+ (xaccTransSetCurrency gnc-xtn
(gnc-default-currency))
;; build the transaction
@@ -368,7 +368,7 @@
qif-acct-map qif-cat-map qif-memo-map)
(let ((splits (qif-xtn:splits qif-xtn))
(gnc-near-split (gnc:split-create (gnc-get-current-book)))
- (near-split-total (gnc:numeric-zero))
+ (near-split-total (gnc-numeric-zero))
(near-acct-info #f)
(near-acct-name #f)
(near-acct #f)
@@ -379,11 +379,11 @@
(qif-memo (qif-split:memo (car (qif-xtn:splits qif-xtn))))
(qif-from-acct (qif-xtn:from-acct qif-xtn))
(qif-cleared (qif-xtn:cleared qif-xtn))
- (n- (lambda (n) (gnc:numeric-neg n)))
- (nsub (lambda (a b) (gnc:numeric-sub a b 0 GNC-DENOM-LCD)))
- (n+ (lambda (a b) (gnc:numeric-add a b 0 GNC-DENOM-LCD)))
- (n* (lambda (a b) (gnc:numeric-mul a b 0 GNC-DENOM-REDUCE)))
- (n/ (lambda (a b) (gnc:numeric-div a b 0 GNC-DENOM-REDUCE))))
+ (n- (lambda (n) (gnc-numeric-neg n)))
+ (nsub (lambda (a b) (gnc-numeric-sub a b 0 GNC-DENOM-LCD)))
+ (n+ (lambda (a b) (gnc-numeric-add a b 0 GNC-DENOM-LCD)))
+ (n* (lambda (a b) (gnc-numeric-mul a b 0 GNC-DENOM-REDUCE)))
+ (n/ (lambda (a b) (gnc-numeric-div a b 0 GNC-DENOM-REDUCE))))
;; set properties of the whole transaction
(apply gnc:transaction-set-date gnc-xtn (qif-xtn:date qif-xtn))
@@ -430,7 +430,7 @@
(memo (qif-split:memo qif-split))
(cat (qif-split:category qif-split)))
- (if (not split-amt) (set! split-amt (gnc:numeric-zero)))
+ (if (not split-amt) (set! split-amt (gnc-numeric-zero)))
;; fill the splits in (near first). This handles
;; files in multiple currencies by pulling the
;; currency value from the file import.
@@ -511,8 +511,8 @@
(defer-share-price #f)
(gnc-far-split (gnc:split-create (gnc-get-current-book))))
- (if (not num-shares) (set! num-shares (gnc:numeric-zero)))
- (if (not share-price) (set! share-price (gnc:numeric-zero)))
+ (if (not num-shares) (set! num-shares (gnc-numeric-zero)))
+ (if (not share-price) (set! share-price (gnc-numeric-zero)))
(if (not split-amt) (set! split-amt (n* num-shares share-price)))
;; I don't think this should ever happen, but I want
@@ -549,14 +549,14 @@
;; are amounts currency or shares?
(case qif-action
((buy buyx reinvint reinvdiv reinvsg reinvsh reinvmd reinvlg)
- (if (not share-price) (set! share-price (gnc:numeric-zero)))
+ (if (not share-price) (set! share-price (gnc-numeric-zero)))
(gnc:split-set-amount gnc-near-split num-shares)
(gnc:split-set-value gnc-near-split split-amt)
(gnc:split-set-value gnc-far-split (n- xtn-amt))
(gnc:split-set-amount gnc-far-split (n- xtn-amt)))
((sell sellx)
- (if (not share-price) (set! share-price (gnc:numeric-zero)))
+ (if (not share-price) (set! share-price (gnc-numeric-zero)))
(gnc:split-set-amount gnc-near-split (n- num-shares))
(gnc:split-set-value gnc-near-split (n- split-amt))
(gnc:split-set-value gnc-far-split xtn-amt)
@@ -597,7 +597,7 @@
;; FIXME : this could be wrong. Make sure the
;; share-amount is at the correct time.
((stksplit)
- (let* ((splitratio (n/ num-shares (gnc:numeric-create 10 1)))
+ (let* ((splitratio (n/ num-shares (gnc-numeric-create 10 1)))
(in-shares
(gnc:account-get-balance near-acct))
(out-shares (n* in-shares splitratio)))
@@ -678,11 +678,11 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (qif-import:mark-some-splits splits xtn candidate-xtns)
- (let* ((n- (lambda (n) (gnc:numeric-neg n)))
- (nsub (lambda (a b) (gnc:numeric-sub a b 0 GNC-DENOM-LCD)))
- (n+ (lambda (a b) (gnc:numeric-add a b 0 GNC-DENOM-LCD)))
- (n* (lambda (a b) (gnc:numeric-mul a b 0 GNC-DENOM-REDUCE)))
- (n/ (lambda (a b) (gnc:numeric-div a b 0 GNC-DENOM-REDUCE)))
+ (let* ((n- (lambda (n) (gnc-numeric-neg n)))
+ (nsub (lambda (a b) (gnc-numeric-sub a b 0 GNC-DENOM-LCD)))
+ (n+ (lambda (a b) (gnc-numeric-add a b 0 GNC-DENOM-LCD)))
+ (n* (lambda (a b) (gnc-numeric-mul a b 0 GNC-DENOM-REDUCE)))
+ (n/ (lambda (a b) (gnc-numeric-div a b 0 GNC-DENOM-REDUCE)))
(split (car splits))
(near-acct-name #f)
(far-acct-name #f)
@@ -703,7 +703,7 @@
(begin
(set! near-acct-name (qif-xtn:from-acct xtn))
(set! far-acct-name (qif-split:category split))
- (set! group-amount (gnc:numeric-zero))
+ (set! group-amount (gnc-numeric-zero))
;; group-amount is the sum of all the splits in this xtn
;; going to the same account as 'split'. We might be able
@@ -789,7 +789,7 @@
(define (qif-import:xtn-has-matches? xtn acct-name date amount group-amt)
(let ((matching-splits '())
(same-acct-splits '())
- (this-group-amt (gnc:numeric-zero))
+ (this-group-amt (gnc-numeric-zero))
(how #f)
(date-matches
(let ((self-date (qif-xtn:date xtn)))
@@ -800,11 +800,11 @@
(= (car self-date) (car date))
(= (cadr self-date) (cadr date))
(= (caddr self-date) (caddr date)))))
- (n- (lambda (n) (gnc:numeric-neg n)))
- (nsub (lambda (a b) (gnc:numeric-sub a b 0 GNC-DENOM-LCD)))
- (n+ (lambda (a b) (gnc:numeric-add a b 0 GNC-DENOM-LCD)))
- (n* (lambda (a b) (gnc:numeric-mul a b 0 GNC-DENOM-REDUCE)))
- (n/ (lambda (a b) (gnc:numeric-div a b 0 GNC-DENOM-REDUCE))))
+ (n- (lambda (n) (gnc-numeric-neg n)))
+ (nsub (lambda (a b) (gnc-numeric-sub a b 0 GNC-DENOM-LCD)))
+ (n+ (lambda (a b) (gnc-numeric-add a b 0 GNC-DENOM-LCD)))
+ (n* (lambda (a b) (gnc-numeric-mul a b 0 GNC-DENOM-REDUCE)))
+ (n/ (lambda (a b) (gnc-numeric-div a b 0 GNC-DENOM-REDUCE))))
(if date-matches
(begin
@@ -831,10 +831,10 @@
;; we might be done if this-amt is either equal
;; to the split amount or the group amount.
(cond
- ((gnc:numeric-equal this-amt amount)
+ ((gnc-numeric-equal this-amt amount)
(set! how
(cons 'one-to-one (list split))))
- ((and group-amt (gnc:numeric-equal this-amt group-amt))
+ ((and group-amt (gnc-numeric-equal this-amt group-amt))
(set! how
(cons 'one-to-many (list split))))
(#t
@@ -850,7 +850,7 @@
;; now we're out of the loop. if 'how' isn't set,
;; we can still have a many-to-one match.
(if (and (not how)
- (gnc:numeric-equal this-group-amt amount))
+ (gnc-numeric-equal this-group-amt amount))
(begin
(set! how
(cons 'many-to-one same-acct-splits))))))
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-acct-table.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-acct-table.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-acct-table.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -72,11 +72,11 @@
(hash-fold
(lambda (name acct p)
- (let ((cmdty (gnc:account-get-commodity acct)))
+ (let ((cmdty (xaccAccountGetCommodity acct)))
(if (not cmdty)
(begin
(gnc:account-begin-edit acct)
- (gnc:account-set-commodity acct commodity)
+ (xaccAccountSetCommodity acct commodity)
(gnc:account-commit-edit acct))))
(let ((type (xaccAccountGetType acct)))
(if (= type -1)
@@ -107,11 +107,11 @@
(hash-fold
(lambda (name acct p)
- (let ((cmdty (gnc:account-get-commodity acct)))
+ (let ((cmdty (xaccAccountGetCommodity acct)))
(if (not cmdty)
(begin
(gnc:account-begin-edit acct)
- (gnc:account-set-commodity acct commodity)
+ (xaccAccountSetCommodity acct commodity)
(gnc:account-commit-edit acct))))
(let ((type (xaccAccountGetType acct)))
(if (= type -1)
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-bank-xtn-import.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-bank-xtn-import.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-bank-xtn-import.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -78,7 +78,7 @@
split))
(gnc:transaction-begin-edit gnc-xtn)
- (gnc:transaction-set-currency gnc-xtn commodity)
+ (xaccTransSetCurrency gnc-xtn commodity)
;; set the transaction date, number and description
(let ((date (qif-io:parse-date/format
@@ -114,7 +114,7 @@
(if parsed-cat (list-ref parsed-cat 1) #f)))
(add-split (cons acct-name
(if acct-is-acct 'account 'category))
- (gnc:numeric-neg near-split-amt)
+ (gnc-numeric-neg near-split-amt)
(qif-io:bank-xtn-memo qif-xtn) #\n))
;; split case: iterate over a list of qif splits and make a
@@ -136,7 +136,7 @@
(qif-io:split-amount split) amt-format)))
(add-split (cons acct-name
(if acct-is-acct 'account 'category))
- (gnc:numeric-neg amount)
+ (gnc-numeric-neg amount)
(qif-io:split-memo split) #\n)))
qif-splits))))
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-format-check.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-format-check.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-format-check.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -143,14 +143,14 @@
(qif-io:bank-xtn-set-t-amount!
bank-formats
(check-field-formats
- qif-io:bank-xtn-t-amount gnc:numeric-equal
+ qif-io:bank-xtn-t-amount gnc-numeric-equal
qif-io:check-number-format '(decimal comma)
(qif-io:file-bank-xtns file)))
(qif-io:bank-xtn-set-u-amount!
bank-formats
(check-field-formats
- qif-io:bank-xtn-u-amount gnc:numeric-equal
+ qif-io:bank-xtn-u-amount gnc-numeric-equal
qif-io:check-number-format '(decimal comma)
(qif-io:file-bank-xtns file)))
@@ -162,7 +162,7 @@
(qif-io:split-set-amount!
split
(check-field-formats
- get-split-amounts gnc:numeric-equal
+ get-split-amounts gnc-numeric-equal
qif-io:check-multi-number-format '(decimal comma)
(qif-io:file-bank-xtns file)))
(qif-io:bank-xtn-set-splits! bank-formats (list split)))
@@ -182,42 +182,42 @@
(qif-io:invst-xtn-set-t-amount!
invst-formats
(check-field-formats
- qif-io:invst-xtn-t-amount gnc:numeric-equal
+ qif-io:invst-xtn-t-amount gnc-numeric-equal
qif-io:check-number-format '(decimal comma)
(qif-io:file-invst-xtns file)))
(qif-io:invst-xtn-set-u-amount!
invst-formats
(check-field-formats
- qif-io:invst-xtn-u-amount gnc:numeric-equal
+ qif-io:invst-xtn-u-amount gnc-numeric-equal
qif-io:check-number-format '(decimal comma)
(qif-io:file-invst-xtns file)))
(qif-io:invst-xtn-set-$-amount!
invst-formats
(check-field-formats
- qif-io:invst-xtn-$-amount gnc:numeric-equal
+ qif-io:invst-xtn-$-amount gnc-numeric-equal
qif-io:check-number-format '(decimal comma)
(qif-io:file-invst-xtns file)))
(qif-io:invst-xtn-set-share-amount!
invst-formats
(check-field-formats
- qif-io:invst-xtn-share-amount gnc:numeric-equal
+ qif-io:invst-xtn-share-amount gnc-numeric-equal
qif-io:check-number-format '(decimal comma)
(qif-io:file-invst-xtns file)))
(qif-io:invst-xtn-set-share-price!
invst-formats
(check-field-formats
- qif-io:invst-xtn-share-price gnc:numeric-equal
+ qif-io:invst-xtn-share-price gnc-numeric-equal
qif-io:check-number-format '(decimal comma)
(qif-io:file-invst-xtns file)))
(qif-io:invst-xtn-set-commission!
invst-formats
(check-field-formats
- qif-io:invst-xtn-commission gnc:numeric-equal
+ qif-io:invst-xtn-commission gnc-numeric-equal
qif-io:check-number-format '(decimal comma)
(qif-io:file-invst-xtns file)))
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-invst-xtn-import.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-invst-xtn-import.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-invst-xtn-import.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -185,7 +185,7 @@
qif-xtn (qif-io:file-default-src-acct qif-file)))
(gnc:transaction-begin-edit gnc-xtn)
- (gnc:transaction-set-currency gnc-xtn commodity)
+ (xaccTransSetCurrency gnc-xtn commodity)
;; set the transaction date, number and description
(let ((date (qif-io:parse-date/format
@@ -232,13 +232,13 @@
($amt
(qif-io:parse-number/format
$amt (qif-io:invst-xtn-$-amount format-info)))
- (#t (gnc:numeric-zero)))))
+ (#t (gnc-numeric-zero)))))
(action-val
(if (and num-shares share-price)
- (gnc:numeric-mul num-shares share-price
- (gnc:numeric-denom total-val)
+ (gnc-numeric-mul num-shares share-price
+ (gnc-numeric-denom total-val)
GNC-RND-ROUND)
- (gnc:numeric-zero)))
+ (gnc-numeric-zero)))
(cleared
(qif-io:parse-cleared-field (qif-io:invst-xtn-cleared qif-xtn)))
(payee (qif-io:invst-xtn-payee qif-xtn))
@@ -250,7 +250,7 @@
(commission-acct
(cons (default-commission-acct
(qif-io:invst-xtn-source-acct qif-xtn)) 'brokerage))
- (n- (lambda (n) (gnc:numeric-neg n))))
+ (n- (lambda (n) (gnc-numeric-neg n))))
;; now build the splits. We have to switch on the action
;; again to get the signs of the amounts, and whether we use the
@@ -293,8 +293,8 @@
(add-split commission-acct commission-val commission-val
memo cleared)))
((stksplit)
- (let* ((splitratio (gnc:numeric-div
- num-shares (gnc:numeric-create 10 1)
+ (let* ((splitratio (gnc-numeric-div
+ num-shares (gnc-numeric-create 10 1)
GNC-DENOM-AUTO GNC-DENOM-REDUCE))
(in-shares (lookup-balance near-acct))
(out-shares (n* in-shares splitratio)))
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-parse.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-parse.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/qif-parse.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -572,12 +572,12 @@
(with-input-from-string filtered-string
(lambda () (read)))))
(if (number? read-val)
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
(+ 0.0 read-val) GNC-DENOM-AUTO
(logior (GNC-DENOM-SIGFIGS
(string-length (string-remove-char filtered-string #\.)))
GNC-RND-ROUND))
- (gnc:numeric-zero))))
+ (gnc-numeric-zero))))
((comma)
(let* ((filtered-string
(string-remove-char
@@ -589,21 +589,21 @@
(with-input-from-string filtered-string
(lambda () (read)))))
(if (number? read-val)
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
(+ 0.0 read-val) GNC-DENOM-AUTO
(logior (GNC-DENOM-SIGFIGS
(string-length (string-remove-char filtered-string #\.)))
GNC-RND-ROUND))
- (gnc:numeric-zero))))
+ (gnc-numeric-zero))))
((integer)
(let ((read-val
(with-input-from-string
(string-remove-char value-string #\$)
(lambda () (read)))))
(if (number? read-val)
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
(+ 0.0 read-val) 1 GNC-RND-ROUND)
- (gnc:numeric-zero))))
+ (gnc-numeric-zero))))
(else
(throw 'qif-io:arg-type 'qif-io:parse-number/format
'number-format format))))
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/test/test-import-phase-1.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/test/test-import-phase-1.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/test/test-import-phase-1.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -17,10 +17,10 @@
(let ((qiffile (qif-io:make-empty-file))
(acct-table (qif-io:make-empty-acct-table))
(session (gnc:get-current-session))
- (book (gnc:session-get-book session))
- (com-table (gnc:commodity-table-new)))
+ (book (qof-session-get-book session))
+ (com-table (gnc-commodity-table-new)))
- (gnc:commodity-table-add-default-data com-table book)
+ (gnc-commodity-table-add-default-data com-table book)
;; read the file and look at data formats. we need to do this
;; immediately when loading a file.
@@ -42,7 +42,7 @@
(if (qif-io:file-xtns-need-acct? qiffile)
(qif-io:file-set-default-src-acct! qiffile filename))
- (let ((commodity (gnc:commodity-table-lookup com-table "ISO4217" "USD")))
+ (let ((commodity (gnc-commodity-table-lookup com-table "ISO4217" "USD")))
;; import the bank transactions
(for-each
@@ -62,7 +62,7 @@
;; write the file
(let* ((name (simple-format #f "file:~A.gnc" filename)))
(simple-format #t "using book name='~A'\n" name)
- (gnc:group-concat-group (gnc:book-get-group book) group)
+ (gnc:group-concat-group (xaccGetAccountGroup book) group)
(gnc:account-group-destroy group)
(gnc:session-begin session name #t #t)
(gnc:session-save session)
Modified: gnucash/branches/swig-redo/src/import-export/qif-io-core/test/test-parser.scm
===================================================================
--- gnucash/branches/swig-redo/src/import-export/qif-io-core/test/test-parser.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/import-export/qif-io-core/test/test-parser.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -54,7 +54,7 @@
(let ((all-pass #t))
(define (parse-number/format num fmt)
(let* ((gncn (qif-io:parse-number/format num fmt))
- (nstr (gnc:numeric-to-string gncn)))
+ (nstr (gnc-numeric-to-string gncn)))
nstr))
;; test category reading
Modified: gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf-de_DE.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf-de_DE.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf-de_DE.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -68,7 +68,7 @@
(define levelx-collector (make-level-collector MAX-LEVELS))
-(define today (gnc:timepair-canonical-day-time
+(define today (timespecCanonicalDayTime
(cons (current-time) 0)))
(define bdtm
@@ -291,7 +291,7 @@
(let* ((print-info (gnc-account-print-info account #t))
(txf? (gnc:account-get-txf account)))
(if (and txf?
- (not (gnc:numeric-zero-p account-value)))
+ (not (gnc-numeric-zero-p account-value)))
(let* ((type (xaccAccountGetType account))
(code (gnc:account-get-txf-code account))
(date-str (if date
@@ -307,8 +307,8 @@
""
"-")
(number->string
- (gnc:numeric-num
- (gnc:numeric-convert account-value (cond
+ (gnc-numeric-num
+ (gnc-numeric-convert account-value (cond
((eq? format 2) 1)
(else 100))
3))))) ;; 3 is the GNC_HOW_TRUNC truncation rounding
@@ -411,7 +411,7 @@
(txf-check-dups account))
(if (or (not suppress-0) (= level 1)
- (not (gnc:numeric-zero-p lx-value)))
+ (not (gnc-numeric-zero-p lx-value)))
(begin
(gnc:html-table-prepend-row!
table
@@ -590,7 +590,7 @@
;; paymnent from the right year
(from-est (if full-year?
(let ((bdtm (gnc:timepair->date
- (gnc:timepair-canonical-day-time
+ (timespecCanonicalDayTime
from-value))))
(set-tm:mday bdtm 1) ; 01
(set-tm:mon bdtm 2) ; Mar
@@ -599,7 +599,7 @@
from-value))
(to-est (if full-year?
(let* ((bdtm (gnc:timepair->date
- (gnc:timepair-canonical-day-time
+ (timespecCanonicalDayTime
from-value))))
(set-tm:mday bdtm 28) ; 28
(set-tm:mon bdtm 1) ; Feb
@@ -689,25 +689,25 @@
account from-special to-special #f)
(gnc:account-get-balance-interval
account from-value to-value #f))
- (gnc:numeric-zero)))) ; don't add non tax related
+ (gnc-numeric-zero)))) ; don't add non tax related
(set! account-balance
- (gnc:numeric-add-fixed
+ (gnc-numeric-add-fixed
(if (> max-level level)
(cadr
(lx-collector (+ 1 level)
'getpair
- (gnc:account-get-commodity account)
+ (xaccAccountGetCommodity account)
#f))
- (gnc:numeric-zero))
+ (gnc-numeric-zero))
;; make positive
(if (eq? type ACCT-TYPE-INCOME)
- (gnc:numeric-neg account-balance)
+ (gnc-numeric-neg account-balance)
account-balance)))
(lx-collector level
'add
- (gnc:account-get-commodity account)
+ (xaccAccountGetCommodity account)
account-balance)
(let ((level-x-output
@@ -747,11 +747,11 @@
(to-year (strftime "%Y" (localtime (car to-value))))
(today-date (strftime "%d.%m.%Y"
(localtime
- (car (gnc:timepair-canonical-day-time
+ (car (timespecCanonicalDayTime
(cons (current-time) 0))))))
(tax-nr (or
- (gnc:kvp-frame-get-slot-path
- (gnc:book-get-slots (gnc-get-current-book))
+ (kvp-frame-get-slot-path-gslist
+ (gnc-book-get-slots (gnc-get-current-book))
(append gnc:*kvp-option-path*
(list gnc:*tax-label* gnc:*tax-nr-label*)))
""))
Modified: gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/locale-specific/us/taxtxf.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -52,7 +52,7 @@
(define levelx-collector (make-level-collector MAX-LEVELS))
-(define today (gnc:timepair-canonical-day-time
+(define today (timespecCanonicalDayTime
(cons (current-time) 0)))
(define bdtm
@@ -276,7 +276,7 @@
(value (xaccPrintAmount account-value print-info))
(txf? (gnc:account-get-txf account)))
(if (and txf?
- (not (gnc:numeric-zero-p account-value)))
+ (not (gnc-numeric-zero-p account-value)))
(let* ((type (xaccAccountGetType account))
(code (gnc:account-get-txf-code account))
(date-str (if date
@@ -388,7 +388,7 @@
(txf-check-dups account))
(if (or (not suppress-0) (= level 1)
- (not (gnc:numeric-zero-p lx-value)))
+ (not (gnc-numeric-zero-p lx-value)))
(begin
(gnc:html-table-prepend-row!
table
@@ -567,7 +567,7 @@
;; paymnent from the right year
(from-est (if full-year?
(let ((bdtm (gnc:timepair->date
- (gnc:timepair-canonical-day-time
+ (timespecCanonicalDayTime
from-value))))
(set-tm:mday bdtm 1) ; 01
(set-tm:mon bdtm 2) ; Mar
@@ -576,7 +576,7 @@
from-value))
(to-est (if full-year?
(let* ((bdtm (gnc:timepair->date
- (gnc:timepair-canonical-day-time
+ (timespecCanonicalDayTime
from-value))))
(set-tm:mday bdtm 28) ; 28
(set-tm:mon bdtm 1) ; Feb
@@ -666,25 +666,25 @@
account from-special to-special #f)
(gnc:account-get-balance-interval
account from-value to-value #f))
- (gnc:numeric-zero)))) ; don't add non tax related
+ (gnc-numeric-zero)))) ; don't add non tax related
(set! account-balance
- (gnc:numeric-add-fixed
+ (gnc-numeric-add-fixed
(if (> max-level level)
(cadr
(lx-collector (+ 1 level)
'getpair
- (gnc:account-get-commodity account)
+ (xaccAccountGetCommodity account)
#f))
- (gnc:numeric-zero))
+ (gnc-numeric-zero))
;; make positive
(if (eq? type ACCT-TYPE-INCOME)
- (gnc:numeric-neg account-balance)
+ (gnc-numeric-neg account-balance)
account-balance)))
(lx-collector level
'add
- (gnc:account-get-commodity account)
+ (xaccAccountGetCommodity account)
account-balance)
(let ((level-x-output
@@ -723,7 +723,7 @@
(to-date (strftime "%Y-%b-%d" (localtime (car to-value))))
(today-date (strftime "D%m/%d/%Y"
(localtime
- (car (gnc:timepair-canonical-day-time
+ (car (timespecCanonicalDayTime
(cons (current-time) 0)))))))
;; Now, the main body
Modified: gnucash/branches/swig-redo/src/report/report-gnome/report-gnome.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-gnome/report-gnome.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-gnome/report-gnome.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -115,7 +115,7 @@
(gnc-add-scm-extension custom-menu)
;; run report-hook danglers
- (gnc:hook-run-danglers gnc:*report-hook*)
+ (gnc:hook-run-danglers HOOK-REPORT)
;; push reports (new items added on top of menu)
(gnc:add-report-template-menu-items)
Modified: gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -21,12 +21,12 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define (gnc:commodity-collector-contains-commodity? collector commodity)
+(define (gnc-commodity-collector-contains-commodity? collector commodity)
(let ((ret #f))
- (gnc:commodity-collector-map
+ (gnc-commodity-collector-map
collector
(lambda (comm amt)
- (set! ret (or ret (gnc:commodity-equiv? comm commodity)))))
+ (set! ret (or ret (gnc-commodity-equiv comm commodity)))))
ret
))
@@ -43,13 +43,13 @@
(let ((query (gnc:malloc-query))
(splits #f))
- (gnc:query-set-book query (gnc-get-current-book))
+ (qof-query-set-book query (gnc-get-current-book))
(gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
(gnc:query-add-account-match query
currency-accounts
- 'guid-match-any 'query-and)
+ QOF-GUID-MATCH-ANY QOF-QUERY-AND)
(gnc:query-add-date-match-timepair
- query #f end-date-tp #t end-date-tp 'query-and)
+ query #f end-date-tp #t end-date-tp QOF-QUERY-AND)
;; Get the query result, i.e. all splits in currency
;; accounts.
@@ -58,19 +58,19 @@
;; which have two *different* commodities
;; involved.
(lambda (s) (let ((trans-comm
- (gnc:transaction-get-currency
+ (xaccTransGetCurrency
(gnc:split-get-parent s)))
(acc-comm
- (gnc:account-get-commodity
+ (xaccAccountGetCommodity
(gnc:split-get-account s))))
(and
- (not (gnc:commodity-equiv?
+ (not (gnc-commodity-equiv
trans-comm acc-comm))
(or
(not commodity)
- (gnc:commodity-equiv?
+ (gnc-commodity-equiv
commodity trans-comm)
- (gnc:commodity-equiv?
+ (gnc-commodity-equiv
commodity acc-comm)))))
(gnc:query-get-splits query)))
(gnc:free-query query)
@@ -102,7 +102,7 @@
;; Helper for warnings below.
-(define (gnc:commodity-numeric->string commodity numeric)
+(define (gnc-commodity-numeric->string commodity numeric)
(gnc:monetary->string
(gnc:make-gnc-monetary commodity numeric)))
@@ -115,7 +115,7 @@
;; Returns true if the given pricealist element is a non-zero price.
(define (gnc:price-is-not-zero? elem)
- (not (gnc:numeric-zero-p (second elem))))
+ (not (gnc-numeric-zero-p (second elem))))
;; Create a list of all prices of 'price-commodity' measured in the
;; currency 'report-currency'. The prices are taken from all splits in
@@ -124,24 +124,24 @@
;; 'time' is the timepair when the <gnc:numeric*> 'price' was valid.
(define (gnc:get-commodity-totalavg-prices
currency-accounts end-date-tp price-commodity report-currency)
- (let ((total-foreign (gnc:numeric-zero))
- (total-domestic (gnc:numeric-zero)))
+ (let ((total-foreign (gnc-numeric-zero))
+ (total-domestic (gnc-numeric-zero)))
(filter
gnc:price-is-not-zero?
(map-in-order
(lambda (a)
- (let* ((transaction-comm (gnc:transaction-get-currency
+ (let* ((transaction-comm (xaccTransGetCurrency
(gnc:split-get-parent a)))
- (account-comm (gnc:account-get-commodity
+ (account-comm (xaccAccountGetCommodity
(gnc:split-get-account a)))
- (share-amount (gnc:numeric-abs
+ (share-amount (gnc-numeric-abs
(gnc:split-get-amount a)))
- (value-amount (gnc:numeric-abs
+ (value-amount (gnc-numeric-abs
(gnc:split-get-value a)))
(transaction-date (gnc:transaction-get-date-posted
(gnc:split-get-parent a)))
(foreignlist
- (if (gnc:commodity-equiv? transaction-comm
+ (if (gnc-commodity-equiv transaction-comm
price-commodity)
(list account-comm
share-amount value-amount)
@@ -149,14 +149,14 @@
value-amount share-amount))))
;;(warn "gnc:get-commodity-totalavg-prices: value "
- ;; (gnc:commodity-numeric->string
+ ;; (gnc-commodity-numeric->string
;;(first foreignlist) (second foreignlist))
;; " bought shares "
- ;; (gnc:commodity-numeric->string
+ ;; (gnc-commodity-numeric->string
;;price-commodity (third foreignlist)))
;; Try EURO exchange if necessary
- (if (not (gnc:commodity-equiv? (first foreignlist)
+ (if (not (gnc-commodity-equiv (first foreignlist)
report-currency))
(let ((exchanged (gnc:exchange-by-euro-numeric
(first foreignlist) (second foreignlist)
@@ -169,26 +169,26 @@
(list
transaction-date
- (if (not (gnc:commodity-equiv? (first foreignlist)
+ (if (not (gnc-commodity-equiv (first foreignlist)
report-currency))
(begin
(warn "gnc:get-commodity-totalavg-prices: "
"Sorry, currency exchange not yet implemented:"
- (gnc:commodity-numeric->string
+ (gnc-commodity-numeric->string
(first foreignlist) (second foreignlist))
" (buying "
- (gnc:commodity-numeric->string
+ (gnc-commodity-numeric->string
price-commodity (third foreignlist))
") =? "
- (gnc:commodity-numeric->string
- report-currency (gnc:numeric-zero)))
- (gnc:numeric-zero))
+ (gnc-commodity-numeric->string
+ report-currency (gnc-numeric-zero)))
+ (gnc-numeric-zero))
(begin
- (set! total-foreign (gnc:numeric-add-fixed
+ (set! total-foreign (gnc-numeric-add-fixed
total-foreign (third foreignlist)))
- (set! total-domestic (gnc:numeric-add-fixed
+ (set! total-domestic (gnc-numeric-add-fixed
total-domestic (second foreignlist)))
- (gnc:numeric-div
+ (gnc-numeric-div
total-domestic
total-foreign
GNC-DENOM-AUTO
@@ -238,32 +238,32 @@
gnc:price-is-not-zero?
(map-in-order
(lambda (a)
- (let* ((transaction-comm (gnc:transaction-get-currency
+ (let* ((transaction-comm (xaccTransGetCurrency
(gnc:split-get-parent a)))
- (account-comm (gnc:account-get-commodity
+ (account-comm (xaccAccountGetCommodity
(gnc:split-get-account a)))
- (share-amount (gnc:numeric-abs
+ (share-amount (gnc-numeric-abs
(gnc:split-get-amount a)))
- (value-amount (gnc:numeric-abs
+ (value-amount (gnc-numeric-abs
(gnc:split-get-value a)))
(transaction-date (gnc:transaction-get-date-posted
(gnc:split-get-parent a)))
(foreignlist
- (if (gnc:commodity-equiv? transaction-comm price-commodity)
+ (if (gnc-commodity-equiv transaction-comm price-commodity)
(list account-comm
share-amount value-amount)
(list transaction-comm
value-amount share-amount))))
;;(warn "get-commodity-inst-prices: value "
- ;; (gnc:commodity-numeric->string
+ ;; (gnc-commodity-numeric->string
;; (first foreignlist) (second foreignlist))
;; " bought shares "
- ;;(gnc:commodity-numeric->string
+ ;;(gnc-commodity-numeric->string
;; price-commodity (third foreignlist)))
;; Try EURO exchange if necessary
- (if (not (gnc:commodity-equiv? (first foreignlist)
+ (if (not (gnc-commodity-equiv (first foreignlist)
report-currency))
(let ((exchanged (gnc:exchange-by-euro-numeric
(first foreignlist) (second foreignlist)
@@ -276,21 +276,21 @@
(list
transaction-date
- (if (not (gnc:commodity-equiv? (first foreignlist)
+ (if (not (gnc-commodity-equiv (first foreignlist)
report-currency))
(begin
(warn "get-commodity-inst-prices: "
"Sorry, currency exchange not yet implemented:"
- (gnc:commodity-numeric->string
+ (gnc-commodity-numeric->string
(first foreignlist) (second foreignlist))
" (buying "
- (gnc:commodity-numeric->string
+ (gnc-commodity-numeric->string
price-commodity (third foreignlist))
") =? "
- (gnc:commodity-numeric->string
- report-currency (gnc:numeric-zero)))
- (gnc:numeric-zero))
- (gnc:numeric-div
+ (gnc-commodity-numeric->string
+ report-currency (gnc-numeric-zero)))
+ (gnc-numeric-zero))
+ (gnc-numeric-div
(second foreignlist)
(third foreignlist)
GNC-DENOM-AUTO
@@ -344,12 +344,12 @@
(last earlierlist))))
;; (if earlier
;; (warn "earlier"
- ;; (gnc:print-date (first earlier))
- ;; (gnc:numeric-to-double (second earlier))))
+ ;; (gnc-print-date (first earlier))
+ ;; (gnc-numeric-to-double (second earlier))))
;; (if later
;; (warn "later"
- ;; (gnc:print-date (first later))
- ;; (gnc:numeric-to-double (second later))))
+ ;; (gnc-print-date (first later))
+ ;; (gnc-numeric-to-double (second later))))
(if (and earlier later)
(if (< (abs (gnc:timepair-delta date (first earlier)))
@@ -372,8 +372,8 @@
plist date)))
(if price
price
- (gnc:numeric-zero)))
- (gnc:numeric-zero))))
+ (gnc-numeric-zero)))
+ (gnc-numeric-zero))))
@@ -404,8 +404,8 @@
(a 'add (unknown-coll 'total #f))
(b 'add
;; round to (at least) 8 significant digits
- (gnc:numeric-div
- (gnc:numeric-mul
+ (gnc-numeric-div
+ (gnc-numeric-mul
(un->known-coll 'total #f)
((cdadr known-pair) 'total #f)
GNC-DENOM-AUTO
@@ -420,13 +420,13 @@
;; Go through sumlist.
(for-each
(lambda (otherlist)
- (if (not (gnc:commodity-equiv? (car otherlist) report-commodity))
+ (if (not (gnc-commodity-equiv (car otherlist) report-commodity))
(for-each
(lambda (pair)
;; Check whether by any accident the report-commodity
;; appears here.
(if
- (not (gnc:commodity-equiv? (car pair) report-commodity))
+ (not (gnc-commodity-equiv (car pair) report-commodity))
;; pair-{a,b}: Try to find either the currency of
;; otherlist or of pair in reportlist.
(let ((pair-a
@@ -452,21 +452,21 @@
;; Find the pair's currency in reportlist. FIXME:
;; Also try the Euro here.
(pair-b (assoc (car pair) reportlist))
- (rate (gnc:numeric-zero)))
+ (rate (gnc-numeric-zero)))
(if (and (not pair-a) (not pair-b))
;; If neither the currency of otherlist nor of
;; pair was found in reportlist then we can't
;; resolve the exchange rate to this currency.
(warn "gnc:resolve-unknown-comm:"
"can't calculate rate for "
- (gnc:commodity-value->string
+ (gnc-commodity-value->string
(list (car pair) ((caadr pair) 'total #f)))
" = "
- (gnc:commodity-value->string
+ (gnc-commodity-value->string
(list (car otherlist) ((cdadr pair) 'total #f)))
" to "
- (gnc:commodity-value->string
- (list report-commodity (gnc:numeric-zero))))
+ (gnc-commodity-value->string
+ (list report-commodity (gnc-numeric-zero))))
(if (and pair-a pair-b)
;; If both currencies are found then something
;; went wrong inside
@@ -474,10 +474,10 @@
;; better thing to do in this case.
(warn "gnc:resolve-unknown-comm:"
"Oops - exchange rate ambiguity error: "
- (gnc:commodity-value->string
+ (gnc-commodity-value->string
(list (car pair) ((caadr pair) 'total #f)))
" = "
- (gnc:commodity-value->string
+ (gnc-commodity-value->string
(list (car otherlist)
((cdadr pair) 'total #f))))
(let
@@ -493,9 +493,9 @@
(make-newrate (caadr pair)
(cdadr pair) pair-a)))))
;; (warn "created new rate: "
- ;; (gnc:commodity-value->string (list (car
+ ;; (gnc-commodity-value->string (list (car
;; newrate) ((caadr newrate) 'total #f))) "
- ;; = " (gnc:commodity-value->string (list
+ ;; = " (gnc-commodity-value->string (list
;; report-commodity ((cdadr newrate) 'total
;; #f))))
(set! reportlist (cons newrate reportlist))))))
@@ -505,9 +505,9 @@
(let ((newrate (list (car otherlist)
(cons (cdadr pair) (caadr pair)))))
;; (warn "created new rate: "
- ;; (gnc:commodity-value->string (list (car newrate)
+ ;; (gnc-commodity-value->string (list (car newrate)
;; ((caadr newrate) 'total #f))) " = "
- ;; (gnc:commodity-value->string (list
+ ;; (gnc-commodity-value->string (list
;; report-commodity ((cdadr newrate) 'total #f))))
(set! reportlist (cons newrate reportlist)))))
(cadr otherlist))))
@@ -551,14 +551,14 @@
;; and share-amounts
(for-each
(lambda (a)
- (let* ((transaction-comm (gnc:transaction-get-currency
+ (let* ((transaction-comm (xaccTransGetCurrency
(gnc:split-get-parent a)))
- (account-comm (gnc:account-get-commodity
+ (account-comm (xaccAccountGetCommodity
(gnc:split-get-account a)))
;; Always use the absolute value here.
- (share-amount (gnc:numeric-abs
+ (share-amount (gnc-numeric-abs
(gnc:split-get-amount a)))
- (value-amount (gnc:numeric-abs
+ (value-amount (gnc-numeric-abs
(gnc:split-get-value a)))
(tmp (assoc transaction-comm sumlist))
(comm-list (if (not tmp)
@@ -580,7 +580,7 @@
(let*
;; Put the amounts in the right place.
((foreignlist
- (if (gnc:commodity-equiv? transaction-comm
+ (if (gnc-commodity-equiv transaction-comm
(car comm-list))
(list account-comm
share-amount value-amount)
@@ -619,8 +619,8 @@
(map
(lambda (e)
(list (car e)
- (gnc:numeric-abs
- (gnc:numeric-div ((cdadr e) 'total #f)
+ (gnc-numeric-abs
+ (gnc-numeric-div ((cdadr e) 'total #f)
((caadr e) 'total #f)
GNC-DENOM-AUTO
(logior (GNC-DENOM-SIGFIGS 8) GNC-RND-ROUND)))))
@@ -662,7 +662,7 @@
;; #f if the commodities don't match. Therefore, if you use this
;; function in a mixed commodity context, stuff will probably crash.
(define (gnc:exchange-if-same foreign domestic)
- (if (gnc:commodity-equiv? (gnc:gnc-monetary-commodity foreign) domestic)
+ (if (gnc-commodity-equiv (gnc:gnc-monetary-commodity foreign) domestic)
foreign
#f))
@@ -684,10 +684,10 @@
(let ((pair (assoc (gnc:gnc-monetary-commodity foreign)
exchangelist)))
(if (not pair)
- (gnc:numeric-zero)
- (gnc:numeric-mul (gnc:gnc-monetary-amount foreign)
+ (gnc-numeric-zero)
+ (gnc-numeric-mul (gnc:gnc-monetary-amount foreign)
(cadr pair)
- (gnc:commodity-get-fraction domestic)
+ (gnc-commodity-get-fraction domestic)
GNC-RND-ROUND)))))
#f)))))
@@ -700,16 +700,16 @@
(gnc:make-gnc-monetary
domestic
(if price-value
- (gnc:numeric-mul (gnc:gnc-monetary-amount foreign)
+ (gnc-numeric-mul (gnc:gnc-monetary-amount foreign)
price-value
- (gnc:commodity-get-fraction domestic)
+ (gnc-commodity-get-fraction domestic)
GNC-RND-ROUND)
(begin
(warn "gnc:exchange-by-pricevalue-helper: No price found for "
(gnc:monetary->string foreign) " into "
(gnc:monetary->string
- (gnc:make-gnc-monetary domestic (gnc:numeric-zero))))
- (gnc:numeric-zero))))
+ (gnc:make-gnc-monetary domestic (gnc-numeric-zero))))
+ (gnc-numeric-zero))))
#f))
;; Helper for gnc:exchange-by-pricedb-* below. 'price' gets tested for
@@ -723,18 +723,18 @@
domestic
(if price
(let ((result
- (gnc:numeric-mul (gnc:gnc-monetary-amount foreign)
- (gnc:price-get-value price)
- (gnc:commodity-get-fraction domestic)
+ (gnc-numeric-mul (gnc:gnc-monetary-amount foreign)
+ (gnc-price-get-value price)
+ (gnc-commodity-get-fraction domestic)
GNC-RND-ROUND)))
- (gnc:price-unref price)
+ (gnc-price-unref price)
result)
(begin
(warn "gnc:exchange-by-pricedb-helper: No price found for "
(gnc:monetary->string foreign) " into "
(gnc:monetary->string
- (gnc:make-gnc-monetary domestic (gnc:numeric-zero))))
- (gnc:numeric-zero))))
+ (gnc:make-gnc-monetary domestic (gnc-numeric-zero))))
+ (gnc-numeric-zero))))
#f))
;; This is another ready-to-use function for calculation of exchange
@@ -751,8 +751,8 @@
(gnc:exchange-if-same foreign domestic)
(gnc:make-gnc-monetary
domestic
- (gnc:pricedb-convert-balance-latest-price
- (gnc:book-get-pricedb (gnc-get-current-book))
+ (gnc-pricedb-convert-balance-latest-price
+ (gnc-pricedb-get-db (gnc-get-current-book))
(gnc:gnc-monetary-amount foreign)
(gnc:gnc-monetary-commodity foreign)
domestic)))
@@ -774,11 +774,11 @@
(gnc:exchange-if-same foreign domestic)
(gnc:make-gnc-monetary
domestic
- (gnc:pricedb-convert-balance-nearest-price
- (gnc:book-get-pricedb (gnc-get-current-book))
+ (gnc-pricedb-convert-balance-nearest-price
+ (gnc-pricedb-get-db (gnc-get-current-book))
(gnc:gnc-monetary-amount foreign)
(gnc:gnc-monetary-commodity foreign)
- domestic (gnc:timepair-canonical-day-time date))))
+ domestic (timespecCanonicalDayTime date))))
#f))
;; Exchange by the nearest price from pricelist. This function takes
@@ -889,7 +889,7 @@
(foreign
'format
(lambda (curr val)
- (if (gnc:commodity-equiv? domestic curr)
+ (if (gnc-commodity-equiv domestic curr)
(balance 'add domestic val)
(balance 'add domestic
(gnc:gnc-monetary-amount
@@ -917,9 +917,9 @@
(foreign
'format
(lambda (curr val)
- (if (gnc:commodity-equiv? domestic curr)
+ (if (gnc-commodity-equiv domestic curr)
(balance 'add domestic val)
- (if (gnc:commodity-is-currency? curr)
+ (if (gnc-commodity-is-currency curr)
(balance 'add curr val)
(balance 'add domestic
(gnc:gnc-monetary-amount
@@ -932,9 +932,9 @@
;; Returns the number of commodities in a commodity-collector.
;; (If this were implemented as a record, I would be able to
;; just (length ...) the alist, but....)
-(define (gnc:commodity-collector-commodity-count collector)
+(define (gnc-commodity-collector-commodity-count collector)
(let ((commodities 0))
- (gnc:commodity-collector-map
+ (gnc-commodity-collector-map
collector
(lambda (comm amt)
(set! commodities (+ commodities 1))))
@@ -944,11 +944,11 @@
(define (gnc:uniform-commodity? amt report-commodity)
;; function to see if the commodity-collector amt
;; contains any foreign commodities
- (let ((elts (gnc:commodity-collector-commodity-count amt))
+ (let ((elts (gnc-commodity-collector-commodity-count amt))
)
(or (equal? elts 0)
(and (equal? elts 1)
- (gnc:commodity-collector-contains-commodity?
+ (gnc-commodity-collector-contains-commodity?
amt report-commodity)
)
)
Modified: gnucash/branches/swig-redo/src/report/report-system/html-acct-table.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-acct-table.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/html-acct-table.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -406,7 +406,7 @@
;; account-commodity: commodity
;;
;; returns the default commodity of the account in the current
-;; row, as returned by gnc:account-get-commodity. the g-wrap
+;; row, as returned by xaccAccountGetCommodity. the g-wrap
;; documentation string reads: "Get the commodity in which the
;; account is denominated." note: afaik, gnucash accounts can
;; only contain one commodity; but it's plausible that future
@@ -696,7 +696,7 @@
(let ((this-collector
(my-get-balance-nosub account start-date end-date)))
(for-each
- (lambda (x) (if x (gnc:commodity-collector-merge this-collector x)))
+ (lambda (x) (if x (gnc-commodity-collector-merge this-collector x)))
(gnc:group-map-all-accounts
(lambda (a)
;; Important: Calculate the balance if and only if the
@@ -726,7 +726,7 @@
(account-children subaccts)
(account-depth acct-depth)
(logical-depth logi-depth)
- (account-commodity (gnc:account-get-commodity acct))
+ (account-commodity (xaccAccountGetCommodity acct))
(account-type (xaccAccountGetType acct))
;; N.B.: xaccAccountGetTypeStr really should be
;; called gnc:account-type-get-string
@@ -788,7 +788,7 @@
(or (not (use-acct? acct))
;; ok, so we'll consider parent accounts with zero
;; recursive-bal to be zero balance leaf accounts
- (and (gnc:commodity-collector-allzero? recursive-bal)
+ (and (gnc-commodity-collector-allzero? recursive-bal)
(equal? zero-mode 'omit-leaf-acct))
(begin
(set! row-env
@@ -817,7 +817,7 @@
(or (not (use-acct? acct))
(not subtotal-mode)
;; ditto that remark concerning zero recursive-bal...
- (and (gnc:commodity-collector-allzero? recursive-bal)
+ (and (gnc-commodity-collector-allzero? recursive-bal)
(equal? zero-mode 'omit-leaf-acct))
;; ignore use-acct for subtotals...?
;; (not (use-acct? acct))
@@ -1058,7 +1058,7 @@
(gnc:html-table-append-row/markup! html-table row-markup row)
(gnc:html-table-append-row! html-table row))))
-(define (gnc:commodity-table amount report-commodity exchange-fn)
+(define (gnc-commodity-table amount report-commodity exchange-fn)
;; this creates a small two-column table listing each commodity
;; balance and its respective report balance. note that this
;; shows report-commodity amounts twice: first as a commodity
@@ -1067,7 +1067,7 @@
;; readable.
(let* ((table (gnc:make-html-table))
)
- (gnc:commodity-collector-map
+ (gnc-commodity-collector-map
amount
(lambda (curr val)
(let ((bal (gnc:make-gnc-monetary curr val)))
@@ -1182,7 +1182,7 @@
;; amount is either a <gnc:monetary> or #f
(amount (and comm-amt
(if (and (equal? zero-mode 'omit-balance)
- (gnc:commodity-collector-allzero?
+ (gnc-commodity-collector-allzero?
comm-amt)
)
#f
@@ -1204,7 +1204,7 @@
(equal?
row-type 'account-row)
)
- gnc:commodity-table
+ gnc-commodity-table
gnc:sum-collector-commodity
)
amt
@@ -1216,7 +1216,7 @@
; (equal?
; row-type 'account-row)
; )
-; (gnc:commodity-table
+; (gnc-commodity-table
; amt
; report-commodity
; exchange-fn)
Modified: gnucash/branches/swig-redo/src/report/report-system/html-barchart.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-barchart.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/html-barchart.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -273,7 +273,7 @@
(let ((n (read)))
(if (number? n) n 0.0)))))
((gnc:gnc-numeric? elt)
- (gnc:numeric-to-double elt))
+ (gnc-numeric-to-double elt))
(#t
0.0)))
Modified: gnucash/branches/swig-redo/src/report/report-system/html-piechart.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-piechart.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/html-piechart.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -143,7 +143,7 @@
(let ((n (read)))
(if (number? n) (abs n) 0.0)))))
((gnc:gnc-numeric? elt)
- (abs (gnc:numeric-to-double elt)))
+ (abs (gnc-numeric-to-double elt)))
(#t
0.0)))
nlist))
Modified: gnucash/branches/swig-redo/src/report/report-system/html-scatter.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-scatter.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/html-scatter.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -134,7 +134,7 @@
(let ((n (read)))
(if (number? n) n 0.0)))))
((gnc:gnc-numeric? elt)
- (gnc:numeric-to-double elt))
+ (gnc-numeric-to-double elt))
(#t
0.0)))
Modified: gnucash/branches/swig-redo/src/report/report-system/html-style-info.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-style-info.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/html-style-info.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -296,7 +296,7 @@
(define (gnc:default-html-number-renderer datum params)
(xaccPrintAmount
- (gnc:double-to-gnc-numeric datum 100 GNC-RND-ROUND)
+ (double-to-gnc-numeric datum 100 GNC-RND-ROUND)
(gnc-default-print-info #f)))
Modified: gnucash/branches/swig-redo/src/report/report-system/html-style-sheet.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-style-sheet.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/html-style-sheet.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -126,7 +126,7 @@
(record-accessor <html-style-sheet> 'style))
(define gnc:current-saved-stylesheets
- (gnc:build-dotgnucash-path "stylesheets-2.0"))
+ (gnc-build-dotgnucash-path "stylesheets-2.0"))
(define (gnc:save-style-sheet-options)
(let ((port (false-if-exception
Modified: gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/html-utilities.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -48,7 +48,7 @@
(define (gnc:price-anchor-text price)
(gnc-build-url URL-TYPE-PRICE
- (string-append "price-guid=" (gnc:price-get-guid price))
+ (string-append "price-guid=" (gncPriceGetGUID price))
""))
;; Make a new report and return the anchor to it. The new report of
@@ -102,7 +102,7 @@
(gnc:price-anchor-text price)
(if value
value
- (gnc:price-get-value price)))
+ (gnc-price-get-value price)))
value)))
(define (gnc:assign-colors num-colors)
@@ -266,13 +266,13 @@
(if (and (not is-stock-account?)
;; FIXME: need to check whether we really have only one
;; foreign currency if is-stock-account==#t.
- (gnc:commodity-equiv? my-commodity report-commodity))
+ (gnc-commodity-equiv my-commodity report-commodity))
;; usual case: the account balance in terms of report
;; commodity
(commodity-row-helper!
my-name #f
(if balance
- (gnc:commodity-collector-assoc
+ (gnc-commodity-collector-assoc
balance report-commodity reverse-balance?)
#f)
main-row-style)
@@ -281,7 +281,7 @@
;; (loop below). Is also used if is-stock-account? is true.
(let ((my-balance
(if balance
- (gnc:commodity-collector-assoc
+ (gnc-commodity-collector-assoc
balance my-commodity reverse-balance?) #f)))
(set! already-printed my-commodity)
(commodity-row-helper!
@@ -294,12 +294,12 @@
;; balance and its corresponding value in the
;; report-currency. One row for each non-report-currency.
(if (and balance (not is-stock-account?))
- (gnc:commodity-collector-map
+ (gnc-commodity-collector-map
balance
(lambda (curr val)
- (if (or (gnc:commodity-equiv? curr report-commodity)
+ (if (or (gnc-commodity-equiv curr report-commodity)
(and already-printed
- (gnc:commodity-equiv? curr already-printed)))
+ (gnc-commodity-equiv curr already-printed)))
'()
(let ((bal
(if reverse-balance?
@@ -456,7 +456,7 @@
(let ((this-collector (my-get-balance-nosub account)))
(for-each
(lambda (x) (if x
- (gnc:commodity-collector-merge
+ (gnc-commodity-collector-merge
this-collector x )))
(gnc:group-map-all-accounts
(lambda (a)
@@ -482,7 +482,7 @@
;; preference.
(define (show-acct? a)
(and (or show-zero-entries?
- (not (gnc:commodity-collector-allzero?
+ (not (gnc-commodity-collector-allzero?
(my-get-balance a))))
(use-acct? a)))
@@ -537,7 +537,7 @@
(if show-other-curr?
(add-commodity-rows! current-depth
(gnc:html-account-anchor acct)
- (gnc:account-get-commodity acct)
+ (xaccAccountGetCommodity acct)
(my-get-balance acct)
(gnc-reverse-balance acct)
(gnc:account-has-shares? acct)
@@ -629,7 +629,7 @@
subaccounts my-get-balance
gnc-reverse-balance)))
(if thisbalance
- (gnc:commodity-collector-merge subbalance thisbalance))
+ (gnc-commodity-collector-merge subbalance thisbalance))
subbalance)
heading-style
#t #f)))))
@@ -751,18 +751,18 @@
((exchanged
(exchange-fn
(gnc:make-gnc-monetary commodity
- (gnc:numeric-create 1000 1))
+ (gnc-numeric-create 1000 1))
common-commodity)))
(gnc:html-table-append-row!
table
(list
(gnc:make-gnc-monetary commodity
- (gnc:numeric-create 1 1))
+ (gnc-numeric-create 1 1))
(gnc:make-gnc-monetary
common-commodity
- (gnc:numeric-div
+ (gnc-numeric-div
(gnc:gnc-monetary-amount exchanged)
- (gnc:numeric-create 1000 1)
+ (gnc-numeric-create 1000 1)
GNC-DENOM-AUTO
(logior (GNC-DENOM-SIGFIGS 6)
GNC-RND-ROUND)))))))
Modified: gnucash/branches/swig-redo/src/report/report-system/report-system.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/report-system.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/report-system.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -23,7 +23,7 @@
(export gnc:get-match-commodity-splits)
(export gnc:get-match-commodity-splits-sorted)
(export gnc:get-all-commodity-splits )
-(export gnc:commodity-numeric->string)
+(export gnc-commodity-numeric->string)
(export gnc:exchange-by-euro-numeric)
(export gnc:get-commodity-totalavg-prices)
(export gnc:get-commoditylist-totalavg-prices)
@@ -46,7 +46,7 @@
(export gnc:case-exchange-time-fn)
(export gnc:sum-collector-commodity)
(export gnc:sum-collector-stocks)
-(export gnc:commodity-collector-contains-commodity?)
+(export gnc-commodity-collector-contains-commodity?)
;; options-utilities.scm
@@ -439,7 +439,7 @@
(export gnc:html-table-add-labeled-amount-line!)
(export gnc:html-table-add-account-balances)
(export gnc:second-html-build-acct-table)
-(export gnc:commodity-table)
+(export gnc-commodity-table)
(export gnc:uniform-commodity?)
;; html-table.scm
@@ -552,7 +552,7 @@
(export list-ref-safe)
(export list-set-safe!)
-(export gnc:commodity-value->string)
+(export gnc-commodity-value->string)
(export gnc:monetary->string)
(export gnc:account-has-shares?)
(export gnc:account-is-stock?)
@@ -571,7 +571,7 @@
(export gnc:make-value-collector)
(export gnc:make-numeric-collector)
(export gnc:make-commodity-collector)
-(export gnc:commodity-collector-commodity-count)
+(export gnc-commodity-collector-commodity-count)
(export gnc:account-get-balance-at-date)
(export gnc:account-get-comm-balance-at-date)
(export gnc:accounts-get-balance-helper)
@@ -593,7 +593,7 @@
(export gnc:report-percent-done)
(export gnc:report-finished)
(export gnc:accounts-count-splits)
-(export gnc:commodity-collector-allzero?)
+(export gnc-commodity-collector-allzero?)
(export gnc:account-get-trans-type-balance-interval)
(export gnc:account-get-pos-trans-total-interval)
(export gnc:double-col)
@@ -614,4 +614,4 @@
(load-from-path "report-utilities.scm")
(load-from-path "report.scm")
-(gnc:hook-add-dangler gnc:*save-options-hook* gnc:save-style-sheet-options)
+(gnc-hook-add-scm-dangler HOOK-SAVE-OPTIONS gnc:save-style-sheet-options)
Modified: gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -38,7 +38,7 @@
;; pair is a list of one gnc:commodity and one gnc:numeric
;; value. Deprecated -- use <gnc-monetary> instead.
-(define (gnc:commodity-value->string pair)
+(define (gnc-commodity-value->string pair)
(xaccPrintAmount
(cadr pair) (gnc-commodity-print-info (car pair) #t)))
@@ -126,10 +126,10 @@
(define (gnc:accounts-get-commodities accounts exclude-commodity)
(delete exclude-commodity
(delete-duplicates
- (sort (map gnc:account-get-commodity accounts)
+ (sort (map xaccAccountGetCommodity accounts)
(lambda (a b)
- (string<? (or (gnc:commodity-get-mnemonic a) "")
- (or (gnc:commodity-get-mnemonic b) "")))))))
+ (string<? (or (gnc-commodity-get-mnemonic a) "")
+ (or (gnc-commodity-get-mnemonic b) "")))))))
;; Returns the depth of the current account hierarchy, that is, the
@@ -303,11 +303,11 @@
;; Same as above but with gnc:numeric
(define (gnc:make-numeric-collector)
(let ;;; values
- ((value (gnc:numeric-zero)))
+ ((value (gnc-numeric-zero)))
(lambda (action amount) ;;; Dispatch function
(case action
((add) (if (gnc:gnc-numeric? amount)
- (set! value (gnc:numeric-add-fixed amount value))
+ (set! value (gnc-numeric-add-fixed amount value))
(gnc:warn
"gnc:numeric-collector called with wrong argument: " amount)))
((total) value)
@@ -351,7 +351,7 @@
;; 'getpair <commodity> signreverse?: Returns the two-element-list
;; with the <commodity> and its corresponding balance. If
;; <commodity> doesn't exist, the balance will be
-;; (gnc:numeric-zero). If signreverse? is true, the result's
+;; (gnc-numeric-zero). If signreverse? is true, the result's
;; sign will be reversed.
;; (internal) 'list #f #f: get the association list of
;; commodity->numeric-collector
@@ -389,7 +389,7 @@
(cond ((null? clist) '())
(else (add-commodity-value
(caar clist)
- (gnc:numeric-neg
+ (gnc-numeric-neg
(gnc:numeric-collector-total (cadar clist))))
(minus-commodity-clist (cdr clist)))))
@@ -408,9 +408,9 @@
(let ((pair (assoc c commoditylist)))
(cons c (cons
(if (not pair)
- (gnc:numeric-zero)
+ (gnc-numeric-zero)
(if sign?
- (gnc:numeric-neg
+ (gnc-numeric-neg
(gnc:numeric-collector-total (cadr pair)))
(gnc:numeric-collector-total (cadr pair))))
'()))))
@@ -422,9 +422,9 @@
(let ((pair (assoc c commoditylist)))
(gnc:make-gnc-monetary
c (if (not pair)
- (gnc:numeric-zero)
+ (gnc-numeric-zero)
(if sign?
- (gnc:numeric-neg
+ (gnc-numeric-neg
(gnc:numeric-collector-total (cadr pair)))
(gnc:numeric-collector-total (cadr pair)))))))
@@ -433,9 +433,9 @@
(case action
((add) (add-commodity-value commodity amount))
((merge) (add-commodity-clist
- (gnc:commodity-collector-list commodity)))
+ (gnc-commodity-collector-list commodity)))
((minusmerge) (minus-commodity-clist
- (gnc:commodity-collector-list commodity)))
+ (gnc-commodity-collector-list commodity)))
((format) (process-commodity-list commodity commoditylist))
((reset) (set! commoditylist '()))
((getpair) (getpair commodity amount))
@@ -451,28 +451,28 @@
;; CAS: ugh. Having two usages is even *more* confusing, so let's
;; please settle on one or the other. What's Step 2? How 'bout
;; documenting the new functions?
-(define (gnc:commodity-collector-add collector commodity amount)
+(define (gnc-commodity-collector-add collector commodity amount)
(collector 'add commodity amount))
-(define (gnc:commodity-collector-merge collector other-collector)
+(define (gnc-commodity-collector-merge collector other-collector)
(collector 'merge other-collector #f))
-(define (gnc:commodity-collector-minusmerge collector other-collector)
+(define (gnc-commodity-collector-minusmerge collector other-collector)
(collector 'minusmerge other-collector #f))
-(define (gnc:commodity-collector-map collector function)
+(define (gnc-commodity-collector-map collector function)
(collector 'format function #f))
-(define (gnc:commodity-collector-assoc collector commodity sign?)
+(define (gnc-commodity-collector-assoc collector commodity sign?)
(collector 'getmonetary commodity sign?))
-(define (gnc:commodity-collector-assoc-pair collector commodity sign?)
+(define (gnc-commodity-collector-assoc-pair collector commodity sign?)
(collector 'getpair commodity sign?))
-(define (gnc:commodity-collector-list collector)
+(define (gnc-commodity-collector-list collector)
(collector 'list #f #f))
;; Returns zero if all entries in this collector are zero.
-(define (gnc:commodity-collector-allzero? collector)
+(define (gnc-commodity-collector-allzero? collector)
(let ((result #t))
- (gnc:commodity-collector-map
+ (gnc-commodity-collector-map
collector
(lambda (commodity amount)
- (if (not (gnc:numeric-zero-p amount))
+ (if (not (gnc-numeric-zero-p amount))
(set! result #f))))
result))
@@ -483,8 +483,8 @@
(define (gnc:account-get-balance-at-date account date include-children?)
(let ((collector (gnc:account-get-comm-balance-at-date
account date include-children?)))
- (cadr (gnc:commodity-collector-assoc-pair
- collector (gnc:account-get-commodity account) #f))))
+ (cadr (gnc-commodity-collector-assoc-pair
+ collector (xaccAccountGetCommodity account) #f))))
;; This works similar as above but returns a commodity-collector,
;; thus takes care of children accounts with different currencies.
@@ -501,12 +501,12 @@
(query (gnc:malloc-query))
(splits #f))
- (gnc:query-set-book query (gnc-get-current-book))
- (gnc:query-add-single-account-match query account 'query-and)
- (gnc:query-add-date-match-timepair query #f date #t date 'query-and)
- (gnc:query-set-sort-order query
- (list gnc:split-trans gnc:trans-date-posted)
- (list gnc:query-default-sort)
+ (qof-query-set-book query (gnc-get-current-book))
+ (gnc:query-add-single-account-match query account QOF-QUERY-AND)
+ (gnc:query-add-date-match-timepair query #f date #t date QOF-QUERY-AND)
+ (qof-query-set-sort-order query
+ (list SPLIT-TRANS TRANS-DATE-POSTED)
+ (list QUERY-DEFAULT-SORT)
'())
(gnc:query-set-sort-increasing query #t #t #t)
(gnc:query-set-max-results query 1)
@@ -515,8 +515,8 @@
(gnc:free-query query)
(if (and splits (not (null? splits)))
- (gnc:commodity-collector-add balance-collector
- (gnc:account-get-commodity account)
+ (gnc-commodity-collector-add balance-collector
+ (xaccAccountGetCommodity account)
(gnc:split-get-balance (car splits))))
balance-collector))
@@ -531,8 +531,8 @@
(for-each
(lambda (acct)
((if (reverse-balance-fn acct)
- gnc:commodity-collector-minusmerge
- gnc:commodity-collector-merge)
+ gnc-commodity-collector-minusmerge
+ gnc-commodity-collector-merge)
collector (get-balance-fn acct)))
accounts)
collector))
@@ -585,7 +585,7 @@
(let ((this-collector (gnc:make-commodity-collector)))
(for-each
(lambda (x)
- (gnc:commodity-collector-merge this-collector x))
+ (gnc-commodity-collector-merge this-collector x))
(gnc:group-map-all-accounts
(lambda (account)
(gnc:account-get-comm-balance-at-date
@@ -599,8 +599,8 @@
(define (gnc:account-get-balance-interval account from to include-children?)
(let ((collector (gnc:account-get-comm-balance-interval
account from to include-children?)))
- (cadr (gnc:commodity-collector-assoc-pair
- collector (gnc:account-get-commodity account) #f))))
+ (cadr (gnc-commodity-collector-assoc-pair
+ collector (xaccAccountGetCommodity account) #f))))
;; the version which returns a commodity-collector
(define (gnc:account-get-comm-balance-interval
@@ -610,7 +610,7 @@
;; instead of the plain date.
(let ((this-collector (gnc:account-get-comm-balance-at-date
account to include-children?)))
- (gnc:commodity-collector-minusmerge
+ (gnc-commodity-collector-minusmerge
this-collector
(gnc:account-get-comm-balance-at-date
account
@@ -622,7 +622,7 @@
(define (gnc:group-get-comm-balance-interval group from to)
(let ((this-collector (gnc:make-commodity-collector)))
(for-each (lambda (x)
- (gnc:commodity-collector-merge this-collector x))
+ (gnc-commodity-collector-merge this-collector x))
(gnc:group-map-all-accounts
(lambda (account)
(gnc:account-get-comm-balance-interval
@@ -635,7 +635,7 @@
(define (gnc:accountlist-get-comm-balance-interval accountlist from to)
(let ((collector (gnc:make-commodity-collector)))
(for-each (lambda (account)
- (gnc:commodity-collector-merge
+ (gnc-commodity-collector-merge
collector (gnc:account-get-comm-balance-interval
account from to #f)))
accountlist)
@@ -644,7 +644,7 @@
(define (gnc:accountlist-get-comm-balance-at-date accountlist date)
(let ((collector (gnc:make-commodity-collector)))
(for-each (lambda (account)
- (gnc:commodity-collector-merge
+ (gnc-commodity-collector-merge
collector (gnc:account-get-comm-balance-at-date
account date #f)))
accountlist)
@@ -653,29 +653,29 @@
;; utility function - ensure that a query matches only non-voids. Destructive.
(define (gnc:query-set-match-non-voids-only! query book)
(let ((temp-query (gnc:malloc-query)))
- (gnc:query-set-book temp-query book)
+ (qof-query-set-book temp-query book)
(gnc:query-add-cleared-match
temp-query
- 'cleared-match-voided
- 'query-and)
+ CLEARED-VOIDED
+ QOF-QUERY-AND)
(set! temp-query (gnc:query-invert temp-query))
- (set! query (gnc:query-merge query temp-query 'query-and))))
+ (set! query (gnc:query-merge query temp-query QOF-QUERY-AND))))
;; utility function - ensure that a query matches only voids. Destructive
(define (gnc:query-set-match-voids-only! query book)
(let ((temp-query (gnc:malloc-query)))
- (gnc:query-set-book temp-query book)
+ (qof-query-set-book temp-query book)
(gnc:query-add-cleared-match
temp-query
- 'cleared-match-voided
- 'query-and)
+ CLEARED-VOIDED
+ QOF-QUERY-AND)
- (set! query (gnc:query-merge query temp-query 'query-and))))
+ (set! query (gnc:query-merge query temp-query QOF-QUERY-AND))))
(define (gnc:split-voided? split)
(let ((trans (gnc:split-get-parent split)))
@@ -722,23 +722,23 @@
(regexp (if (get-val type 'regexp) #t #f))
(total (gnc:make-commodity-collector))
)
- (gnc:query-set-book query (gnc-get-current-book))
+ (qof-query-set-book query (gnc-get-current-book))
(gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
- (gnc:query-add-account-match query group 'guid-match-any 'query-and)
+ (gnc:query-add-account-match query group QOF-GUID-MATCH-ANY QOF-QUERY-AND)
(gnc:query-add-date-match-timepair
query
(and start-date-tp #t) start-date-tp
- (and end-date-tp #t) end-date-tp 'query-and)
+ (and end-date-tp #t) end-date-tp QOF-QUERY-AND)
(gnc:query-add-description-match
- query matchstr case-sens regexp 'query-and)
+ query matchstr case-sens regexp QOF-QUERY-AND)
(set! splits (gnc:query-get-splits query))
(map (lambda (split)
(let* ((shares (gnc:split-get-amount split))
- (acct-comm (gnc:account-get-commodity
+ (acct-comm (xaccAccountGetCommodity
(gnc:split-get-account split)))
)
- (gnc:commodity-collector-add total acct-comm shares)
+ (gnc-commodity-collector-add total acct-comm shares)
)
)
splits
@@ -765,39 +765,39 @@
(pos? (if (get-val type 'positive) #t #f))
(total (gnc:make-commodity-collector))
)
- (gnc:query-set-book str-query (gnc-get-current-book))
- (gnc:query-set-book sign-query (gnc-get-current-book))
+ (qof-query-set-book str-query (gnc-get-current-book))
+ (qof-query-set-book sign-query (gnc-get-current-book))
(gnc:query-set-match-non-voids-only! str-query (gnc-get-current-book))
(gnc:query-set-match-non-voids-only! sign-query (gnc-get-current-book))
- (gnc:query-add-account-match str-query group 'guid-match-any 'query-and)
- (gnc:query-add-account-match sign-query group 'guid-match-any 'query-and)
+ (gnc:query-add-account-match str-query group QOF-GUID-MATCH-ANY QOF-QUERY-AND)
+ (gnc:query-add-account-match sign-query group QOF-GUID-MATCH-ANY QOF-QUERY-AND)
(gnc:query-add-date-match-timepair
str-query
(and start-date-tp #t) start-date-tp
- (and end-date-tp #t) end-date-tp 'query-and)
+ (and end-date-tp #t) end-date-tp QOF-QUERY-AND)
(gnc:query-add-date-match-timepair
sign-query
(and start-date-tp #t) start-date-tp
- (and end-date-tp #t) end-date-tp 'query-and)
+ (and end-date-tp #t) end-date-tp QOF-QUERY-AND)
(gnc:query-add-description-match
- str-query matchstr case-sens regexp 'query-and)
+ str-query matchstr case-sens regexp QOF-QUERY-AND)
(set! total-query
;; this is a tad inefficient, but its a simple way to accomplish
;; description match inversion...
(if pos?
- (gnc:query-merge sign-query str-query 'query-and)
+ (gnc:query-merge sign-query str-query QOF-QUERY-AND)
(gnc:query-merge
- sign-query (gnc:query-invert str-query) 'query-and)
+ sign-query (gnc:query-invert str-query) QOF-QUERY-AND)
))
(set! splits (gnc:query-get-splits total-query))
(map (lambda (split)
(let* ((shares (gnc:split-get-amount split))
- (acct-comm (gnc:account-get-commodity
+ (acct-comm (xaccAccountGetCommodity
(gnc:split-get-account split)))
)
- (or (gnc:numeric-negative-p shares)
- (gnc:commodity-collector-add total acct-comm shares)
+ (or (gnc-numeric-negative-p shares)
+ (gnc-commodity-collector-add total acct-comm shares)
)
)
)
@@ -822,7 +822,7 @@
report-commodity
exchange-fn)))
(amt (and sum (gnc:gnc-monetary-amount sum)))
- (neg? (and amt (gnc:numeric-negative-p amt)))
+ (neg? (and amt (gnc-numeric-negative-p amt)))
(bal (if neg?
(let ((bal (gnc:make-commodity-collector)))
(bal 'minusmerge signed-balance #f)
@@ -834,9 +834,9 @@
exchange-fn))
(balance
(if (gnc:uniform-commodity? bal report-commodity)
- (if (gnc:numeric-zero-p amt) #f bal-sum)
+ (if (gnc-numeric-zero-p amt) #f bal-sum)
(if show-comm?
- (gnc:commodity-table bal report-commodity exchange-fn)
+ (gnc-commodity-table bal report-commodity exchange-fn)
bal-sum)
))
)
Modified: gnucash/branches/swig-redo/src/report/report-system/report.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/report-system/report.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/report-system/report.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -392,7 +392,7 @@
(gnc:report-type report))))
(define gnc:current-saved-reports
- (gnc:build-dotgnucash-path "saved-reports-2.0"))
+ (gnc-build-dotgnucash-path "saved-reports-2.0"))
(define (gnc:report-save-to-savefile report)
(let ((conf-file-name gnc:current-saved-reports))
Modified: gnucash/branches/swig-redo/src/report/standard-reports/account-piecharts.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/account-piecharts.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/account-piecharts.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -239,7 +239,7 @@
;; everything foreign gets converted
;; (gnc:sum-collector-commodity) based on the weighted
;; average of all past transactions.
- (gnc:numeric-to-double
+ (gnc-numeric-to-double
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
c report-currency
@@ -401,19 +401,19 @@
(if do-intervals?
(sprintf #f
(_ "%s to %s")
- (gnc:print-date from-date-tp)
- (gnc:print-date to-date-tp))
+ (gnc-print-date from-date-tp)
+ (gnc-print-date to-date-tp))
(sprintf #f
(_ "Balance at %s")
- (gnc:print-date to-date-tp)))
+ (gnc-print-date to-date-tp)))
(if show-total?
(let ((total (apply + (unzip1 combined))))
(sprintf
#f ": %s"
(xaccPrintAmount
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
total
- (gnc:commodity-get-fraction report-currency)
+ (gnc-commodity-get-fraction report-currency)
GNC-RND-ROUND)
print-info)))
"")))
@@ -433,9 +433,9 @@
(string-append
" - "
(xaccPrintAmount
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
(car pair)
- (gnc:commodity-get-fraction report-currency)
+ (gnc-commodity-get-fraction report-currency)
GNC-RND-ROUND)
print-info))
"")))
Modified: gnucash/branches/swig-redo/src/report/standard-reports/account-summary.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/account-summary.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/account-summary.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -324,7 +324,7 @@
(gnc:html-document-set-title!
doc (string-append company-name " " report-title " "
- (gnc:print-date date-tp))
+ (gnc-print-date date-tp))
)
(if (null? accounts)
Modified: gnucash/branches/swig-redo/src/report/standard-reports/advanced-portfolio.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/advanced-portfolio.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/advanced-portfolio.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -201,58 +201,58 @@
;; cell that mutates to the new average. Need to add a date checker so that we allow for prices
;; coming in out of order, such as a transfer with a price adjusted to carryover the basis.
(define (basis-builder b-list b-units b-value b-method)
- (if (gnc:numeric-positive-p b-units)
+ (if (gnc-numeric-positive-p b-units)
(case b-method
((average-basis)
(if (not (eqv? b-list '()))
- (list (cons (gnc:numeric-add b-units
+ (list (cons (gnc-numeric-add b-units
(caar b-list) 10000 GNC-RND-ROUND)
- (gnc:numeric-div
- (gnc:numeric-add b-value
- (gnc:numeric-mul (caar b-list)
+ (gnc-numeric-div
+ (gnc-numeric-add b-value
+ (gnc-numeric-mul (caar b-list)
(cdar b-list)
10000 GNC-RND-ROUND)
10000 GNC-RND-ROUND)
- (gnc:numeric-add b-units
+ (gnc-numeric-add b-units
(caar b-list) 10000 GNC-RND-ROUND)
10000 GNC-RND-ROUND)))
(append b-list
- (list (cons b-units (gnc:numeric-div
+ (list (cons b-units (gnc-numeric-div
b-value b-units 10000
GNC-RND-ROUND))))))
(else (append b-list
- (list (cons b-units (gnc:numeric-div
+ (list (cons b-units (gnc-numeric-div
b-value b-units 10000
GNC-RND-ROUND))))))
(if (not (eqv? b-list '()))
(case b-method
((fifo-basis)
- (if (not (= -1 (gnc:numeric-compare
- (gnc:numeric-abs b-units) (caar b-list))))
- (basis-builder (cdr b-list) (gnc:numeric-add
+ (if (not (= -1 (gnc-numeric-compare
+ (gnc-numeric-abs b-units) (caar b-list))))
+ (basis-builder (cdr b-list) (gnc-numeric-add
b-units
(caar b-list) 10000 GNC-RND-ROUND)
b-value b-method)
- (append (list (cons (gnc:numeric-add
+ (append (list (cons (gnc-numeric-add
b-units
(caar b-list) 10000 GNC-RND-ROUND)
(cdar b-list))) (cdr b-list))))
((filo-basis)
- (if (not (= -1 (gnc:numeric-compare
- (gnc:numeric-abs b-units) (caar (reverse b-list)))))
+ (if (not (= -1 (gnc-numeric-compare
+ (gnc-numeric-abs b-units) (caar (reverse b-list)))))
(basis-builder (reverse (cdr (reverse b-list)))
- (gnc:numeric-add
+ (gnc-numeric-add
b-units
(caar (reverse b-list))
10000 GNC-RND-ROUND)
b-value b-method)
(append (cdr (reverse b-list))
- (list (cons (gnc:numeric-add
+ (list (cons (gnc-numeric-add
b-units
(caar (reverse b-list)) 10000 GNC-RND-ROUND)
(cdar (reverse b-list)))))))
((average-basis)
- (list (cons (gnc:numeric-add
+ (list (cons (gnc-numeric-add
(caar b-list) b-units 10000 GNC-RND-ROUND)
(cdar b-list)))))
'()
@@ -263,17 +263,17 @@
;; sum up the contents of the b-list built by basis-builder above
(define (sum-basis b-list)
(if (not (eqv? b-list '()))
- (gnc:numeric-add (gnc:numeric-mul (caar b-list) (cdar b-list) 100 GNC-RND-ROUND)
+ (gnc-numeric-add (gnc-numeric-mul (caar b-list) (cdar b-list) 100 GNC-RND-ROUND)
(sum-basis (cdr b-list)) 100 GNC-RND-ROUND)
- (gnc:numeric-zero)
+ (gnc-numeric-zero)
)
)
;; sum up the total number of units in the b-list built by basis-builder above
(define (units-basis b-list)
(if (not (eqv? b-list '()))
- (gnc:numeric-add (caar b-list) (units-basis (cdr b-list)) 100 GNC-RND-ROUND)
- (gnc:numeric-zero)
+ (gnc-numeric-add (caar b-list) (units-basis (cdr b-list)) 100 GNC-RND-ROUND)
+ (gnc-numeric-zero)
)
)
@@ -295,9 +295,9 @@
(current (car accounts))
(rest (cdr accounts))
(name (gnc:account-get-name current))
- (commodity (gnc:account-get-commodity current))
- (ticker-symbol (gnc:commodity-get-mnemonic commodity))
- (listing (gnc:commodity-get-namespace commodity))
+ (commodity (xaccAccountGetCommodity current))
+ (ticker-symbol (gnc-commodity-get-mnemonic commodity))
+ (listing (gnc-commodity-get-namespace commodity))
(unit-collector (gnc:account-get-comm-balance-at-date
current to-date #f))
(units (cadr (unit-collector 'getpair commodity #f)))
@@ -318,15 +318,15 @@
(car price-list) #f))
;; if there is no price, set a sane commod-currency for those zero-share
;; accounts. if its a no price account with shares, we'll get a currency later.
- (commod-currency (if price (gnc:price-get-currency price) currency))
+ (commod-currency (if price (gnc-price-get-currency price) currency))
(value (exchange-fn (gnc:make-gnc-monetary commodity units) currency))
- (txn-value (gnc:numeric-zero))
+ (txn-value (gnc-numeric-zero))
(txn-date to-date)
(pricing-txn #f)
(use-txn #f)
(basis-list '())
- (txn-units (gnc:numeric-zero))
+ (txn-units (gnc-numeric-zero))
)
@@ -350,8 +350,8 @@
s ACCT-TYPE-INCOME))))
;;only change the commod-currency if price failed
- (if (not price) (set! commod-currency (gnc:account-get-commodity (gnc:split-get-account s))))
- (set! txn-value (gnc:numeric-abs (gnc:split-get-value s)));;FIXME use gnc:split-get-share-price
+ (if (not price) (set! commod-currency (xaccAccountGetCommodity (gnc:split-get-account s))))
+ (set! txn-value (gnc-numeric-abs (gnc:split-get-value s)));;FIXME use gnc:split-get-share-price
(set! txn-date (gnc:transaction-get-date-posted parent))
(set! pricing-txn parent)
)
@@ -376,39 +376,39 @@
(lambda (s)
(cond
((same-split? s split)
-;; (gnc:debug "amount " (gnc:numeric-to-double (gnc:split-get-amount s))
+;; (gnc:debug "amount " (gnc-numeric-to-double (gnc:split-get-amount s))
;; " acct " (gnc:account-get-name (gnc:split-get-account s)) )
-;; (gnc:debug "value " (gnc:numeric-to-double (gnc:split-get-value s))
-;; " in " (gnc:commodity-get-printname commod-currency)
+;; (gnc:debug "value " (gnc-numeric-to-double (gnc:split-get-value s))
+;; " in " (gnc-commodity-get-printname commod-currency)
;; " from " (gnc:transaction-get-description (gnc:split-get-parent s)))
(cond
- ((or include-gains (not (gnc:numeric-zero-p (gnc:split-get-amount s))))
+ ((or include-gains (not (gnc-numeric-zero-p (gnc:split-get-amount s))))
(unitscoll 'add commodity (gnc:split-get-amount s)) ;; Is the stock transaction?
;; these lines do nothing, but are in a debug so I'm leaving it, just in case. asw.
-;; (if (< 0 (gnc:numeric-to-double
+;; (if (< 0 (gnc-numeric-to-double
;; (gnc:split-get-amount s)))
;; (set! totalunits
;; (+ totalunits
-;; (gnc:numeric-to-double (gnc:split-get-amount s))))
+;; (gnc-numeric-to-double (gnc:split-get-amount s))))
;; )
;; (set! totalunityears
;; (+ totalunityears
-;; (* (gnc:numeric-to-double (gnc:split-get-amount s))
+;; (* (gnc-numeric-to-double (gnc:split-get-amount s))
;; (gnc:date-year-delta
;; (car (gnc:transaction-get-date-posted parent))
;; (current-time)))))
(cond
- ((gnc:numeric-negative-p (gnc:split-get-value s))
+ ((gnc-numeric-negative-p (gnc:split-get-value s))
(moneyoutcoll
'add commod-currency
- (gnc:numeric-neg (gnc:split-get-value s))))
+ (gnc-numeric-neg (gnc:split-get-value s))))
(else (moneyincoll
'add commod-currency
- (gnc:numeric-neg (gnc:split-get-value s))))))))
+ (gnc-numeric-neg (gnc:split-get-value s))))))))
((split-account-type? s ACCT-TYPE-EXPENSE)
(brokeragecoll 'add commod-currency (gnc:split-get-value s)))
@@ -432,24 +432,24 @@
;; and if we have a choice, use whichever is newest.
(set! use-txn (if (not price) #t
(if prefer-pricelist #f
- (if (not (gnc:timepair-le txn-date (gnc:price-get-time price)))
+ (if (not (gnc:timepair-le txn-date (gnc-price-get-time price)))
#t #f))))
;; okay we're using the txn, so make a new price, value etc. and warn the user
(if use-txn
(begin
- (set! price (if (not (gnc:numeric-zero-p txn-units))
+ (set! price (if (not (gnc-numeric-zero-p txn-units))
(gnc:make-gnc-monetary commod-currency
- (gnc:numeric-div txn-value
- (gnc:numeric-abs txn-units)
+ (gnc-numeric-div txn-value
+ (gnc-numeric-abs txn-units)
100 GNC-RND-ROUND))
- (gnc:make-gnc-monetary commod-currency (gnc:numeric-zero))))
+ (gnc:make-gnc-monetary commod-currency (gnc-numeric-zero))))
(set! value (if price (gnc:make-gnc-monetary commod-currency
- (gnc:numeric-mul units
+ (gnc-numeric-mul units
(gnc:gnc-monetary-amount price)
100 GNC-RND-ROUND))
- (gnc:make-gnc-monetary commod-currency (gnc:numeric-zero))))
+ (gnc:make-gnc-monetary commod-currency (gnc-numeric-zero))))
(set! warn-price-dirty #t)
)
)
@@ -465,17 +465,17 @@
- (if (or include-empty (not (gnc:numeric-zero-p units)))
+ (if (or include-empty (not (gnc-numeric-zero-p units)))
(let* ((moneyin (gnc:monetary-neg
(gnc:sum-collector-commodity moneyincoll currency exchange-fn)))
(moneyout (gnc:sum-collector-commodity moneyoutcoll currency exchange-fn))
;; just so you know, gain == realized gain, ugain == un-realized gain, bothgain, well..
(gain (gnc:sum-collector-commodity gaincoll currency exchange-fn))
(ugain (gnc:make-gnc-monetary currency
- (gnc:numeric-sub (gnc:gnc-monetary-amount (exchange-fn value currency))
+ (gnc-numeric-sub (gnc:gnc-monetary-amount (exchange-fn value currency))
(sum-basis basis-list)
100 GNC-RND-ROUND)))
- (bothgain (gnc:make-gnc-monetary currency (gnc:numeric-add (gnc:gnc-monetary-amount gain)
+ (bothgain (gnc:make-gnc-monetary currency (gnc-numeric-add (gnc:gnc-monetary-amount gain)
(gnc:gnc-monetary-amount ugain)
100 GNC-RND-ROUND)))
@@ -504,8 +504,8 @@
(gnc:html-price-anchor
price
(gnc:make-gnc-monetary
- (gnc:price-get-currency price)
- (gnc:price-get-value price)))
+ (gnc-price-get-currency price)
+ (gnc-price-get-value price)))
)))))
(append! activecols (list (if use-txn "*" " ")
(gnc:make-html-table-header-cell/markup
@@ -519,11 +519,11 @@
(gnc:make-html-table-header-cell/markup "number-cell"
- (let ((moneyinvalue (gnc:numeric-to-double
+ (let ((moneyinvalue (gnc-numeric-to-double
(gnc:gnc-monetary-amount moneyin))))
(if (= 0.0 moneyinvalue)
(sprintf #f "%.2f%%" moneyinvalue)
- (sprintf #f "%.2f%%" (* 100 (/ (gnc:numeric-to-double
+ (sprintf #f "%.2f%%" (* 100 (/ (gnc-numeric-to-double
(gnc:gnc-monetary-amount bothgain))
moneyinvalue))))))
)
@@ -538,7 +538,7 @@
)
(table-add-stock-rows-internal rest odd-row?)
)
- (gnc:price-list-destroy price-list)
+ (gnc-price-list-destroy price-list)
)))
(set! work-to-do (gnc:accounts-count-splits accounts))
@@ -588,30 +588,30 @@
(gnc:html-document-set-title!
document (string-append
report-title
- (sprintf #f " %s" (gnc:print-date to-date))))
+ (sprintf #f " %s" (gnc-print-date to-date))))
(if (not (null? accounts))
; at least 1 account selected
(let* ((exchange-fn (gnc:case-exchange-fn price-source currency to-date))
- (pricedb (gnc:book-get-pricedb (gnc-get-current-book)))
+ (pricedb (gnc-pricedb-get-db (gnc-get-current-book)))
(price-fn
(case price-source
((pricedb-latest)
(lambda (foreign date)
- (gnc:pricedb-lookup-latest-any-currency pricedb foreign)))
+ (gnc-pricedb-lookup-latest-any-currency pricedb foreign)))
((pricedb-nearest)
(lambda (foreign date)
- (gnc:pricedb-lookup-nearest-in-time-any-currency
- pricedb foreign (gnc:timepair-canonical-day-time date))))
+ (gnc-pricedb-lookup-nearest-in-time-any-currency
+ pricedb foreign (timespecCanonicalDayTime date))))
((pricedb-latest-before)
(lambda (foreign date)
- (gnc:pricedb-lookup-latest-before-any-currency
- pricedb foreign (gnc:timepair-canonical-day-time date))))))
+ (gnc-pricedb-lookup-latest-before-any-currency
+ pricedb foreign (timespecCanonicalDayTime date))))))
(headercols (list (_ "Account")))
(totalscols (list (gnc:make-html-table-cell/markup "total-label-cell" (_ "Total"))))
- (sum-total-both-gains (gnc:numeric-zero))
- (sum-total-gain (gnc:numeric-zero))
- (sum-total-ugain (gnc:numeric-zero)))
+ (sum-total-both-gains (gnc-numeric-zero))
+ (sum-total-gain (gnc-numeric-zero))
+ (sum-total-ugain (gnc-numeric-zero)))
;;begin building lists for which columns to display
(if show-symbol
@@ -654,7 +654,7 @@
(set! sum-total-gain (gnc:sum-collector-commodity total-gain currency exchange-fn))
(set! sum-total-ugain (gnc:sum-collector-commodity total-ugain currency exchange-fn))
- (set! sum-total-both-gains (gnc:make-gnc-monetary currency (gnc:numeric-add (gnc:gnc-monetary-amount sum-total-gain)
+ (set! sum-total-both-gains (gnc:make-gnc-monetary currency (gnc-numeric-add (gnc:gnc-monetary-amount sum-total-gain)
(gnc:gnc-monetary-amount sum-total-ugain)
100 GNC-RND-ROUND)))
@@ -683,12 +683,12 @@
"total-number-cell" sum-total-both-gains)
(gnc:make-html-table-cell/markup
"total-number-cell"
- (let ((totalinvalue (gnc:numeric-to-double
+ (let ((totalinvalue (gnc-numeric-to-double
(gnc:gnc-monetary-amount (gnc:monetary-neg (gnc:sum-collector-commodity
total-moneyin currency exchange-fn))))))
(if (= 0.0 totalinvalue)
(sprintf #f "%.2f%%" totalinvalue)
- (sprintf #f "%.2f%%" (* 100 (/ (gnc:numeric-to-double
+ (sprintf #f "%.2f%%" (* 100 (/ (gnc-numeric-to-double
(gnc:gnc-monetary-amount sum-total-both-gains))
totalinvalue))))))
))
Modified: gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -140,8 +140,8 @@
gain-loss-accum)
(set! data-rows
(cons
- (list (gnc:print-date interval-start)
- (gnc:print-date interval-end)
+ (list (gnc-print-date interval-start)
+ (gnc-print-date interval-end)
(/ (stats-accum 'total #f)
(gnc:timepair-delta interval-start
interval-end))
@@ -159,7 +159,7 @@
(define (get-split-value split date)
(monetary->double
(gnc:make-gnc-monetary
- (gnc:account-get-commodity (gnc:split-get-account split))
+ (xaccAccountGetCommodity (gnc:split-get-account split))
(gnc:split-get-amount split))
date))
@@ -306,7 +306,7 @@
(list-all-zeros? (cdr alist)))))
(define (monetary->double foreign-monetary date)
- (gnc:numeric-to-double
+ (gnc-numeric-to-double
(gnc:gnc-monetary-amount
(exchange-fn foreign-monetary report-currency date))))
@@ -340,7 +340,7 @@
;; initialize the query to find splits in the right
;; date range and accounts
- (gnc:query-set-book query (gnc-get-current-book))
+ (qof-query-set-book query (gnc-get-current-book))
;; for balance purposes, we don't need to do this, but it cleans up
;; the table display.
@@ -365,14 +365,14 @@
(delete-duplicates (append accounts subaccts)))))
(gnc:report-percent-done 30)
- (gnc:query-add-account-match query accounts 'guid-match-any 'query-and)
+ (gnc:query-add-account-match query accounts QOF-GUID-MATCH-ANY QOF-QUERY-AND)
;; match splits between start and end dates
(gnc:query-add-date-match-timepair
- query #t begindate #t enddate 'query-and)
- (gnc:query-set-sort-order query
- (list gnc:split-trans gnc:trans-date-posted)
- (list gnc:query-default-sort)
+ query #t begindate #t enddate QOF-QUERY-AND)
+ (qof-query-set-sort-order query
+ (list SPLIT-TRANS TRANS-DATE-POSTED)
+ (list QUERY-DEFAULT-SORT)
'())
;; get the query results
@@ -389,7 +389,7 @@
(gnc:report-percent-done 50)
(set! startbal
- (gnc:numeric-to-double
+ (gnc-numeric-to-double
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
startbal
Modified: gnucash/branches/swig-redo/src/report/standard-reports/balance-sheet.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/balance-sheet.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/balance-sheet.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -369,7 +369,7 @@
(define allow-same-column-totals #t)
(let* ((neg? (and signed-balance
neg-label
- (gnc:numeric-negative-p
+ (gnc-numeric-negative-p
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
signed-balance report-commodity exchange-fn)))))
@@ -409,7 +409,7 @@
;;(gnc:warn "account names" liability-account-names)
(gnc:html-document-set-title!
doc (string-append company-name " " report-title " "
- (gnc:print-date date-tp))
+ (gnc-print-date date-tp))
)
(if (null? accounts)
@@ -523,7 +523,7 @@
report-commodity
weighted-fn)))
- (unrealized-gain (gnc:numeric-sub-fixed value cost)))
+ (unrealized-gain (gnc-numeric-sub-fixed value cost)))
(unrealized-gain-collector 'add report-commodity unrealized-gain)
)
@@ -644,13 +644,13 @@
;; we omit retianed earnings & unrealized gains
;; from the balance report, if zero, since they
;; are not present on normal balance sheets
- (and (not (gnc:commodity-collector-allzero?
+ (and (not (gnc-commodity-collector-allzero?
retained-earnings))
(add-subtotal-line right-table
(_ "Retained Earnings")
(_ "Retained Losses")
retained-earnings))
- (and (not (gnc:commodity-collector-allzero?
+ (and (not (gnc-commodity-collector-allzero?
unrealized-gain-collector))
(add-subtotal-line right-table
(_ "Unrealized Gains")
Modified: gnucash/branches/swig-redo/src/report/standard-reports/budget.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/budget.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/budget.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -114,7 +114,7 @@
(let* ((bgt-col (+ (* period 2) colnum 1))
(act-col (+ 1 bgt-col))
- (comm (gnc:account-get-commodity acct))
+ (comm (xaccAccountGetCommodity acct))
(numeric-val (gnc:budget-get-account-period-value
budget acct period))
@@ -161,7 +161,7 @@
(date (gnc:budget-get-period-start-date budget period))
)
(gnc:html-table-set-cell!
- html-table 0 bgt-col (gnc:print-date date))
+ html-table 0 bgt-col (gnc-print-date date))
(gnc:html-table-set-cell!
html-table
Modified: gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/cash-flow.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -204,7 +204,7 @@
(gnc:html-document-set-title!
doc (sprintf #f (_ "%s - %s to %s for")
(get-option gnc:pagename-general gnc:optname-reportname)
- (gnc:print-date from-date-tp) (gnc:print-date to-date-tp)))
+ (gnc-print-date from-date-tp) (gnc-print-date to-date-tp)))
;; add subaccounts if requested
@@ -252,10 +252,10 @@
(let* ((current (car accounts-internal))
(rest (cdr accounts-internal))
(name (gnc:account-get-name current))
- (curr-commodity (gnc:account-get-commodity current))
+ (curr-commodity (xaccAccountGetCommodity current))
)
- ;(gnc:debug "calc-money-in-out-internal---" name "---" (gnc:commodity-get-printname curr-commodity))
+ ;(gnc:debug "calc-money-in-out-internal---" name "---" (gnc-commodity-get-printname curr-commodity))
(for-each
(lambda (split)
@@ -265,16 +265,16 @@
(if (and (gnc:timepair-le (gnc:transaction-get-date-posted parent) to-date-tp)
(gnc:timepair-ge (gnc:transaction-get-date-posted parent) from-date-tp))
(let* ((parent-description (gnc:transaction-get-description parent))
- (parent-currency (gnc:transaction-get-currency parent)))
+ (parent-currency (xaccTransGetCurrency parent)))
;(gnc:debug parent-description
; " - "
- ; (gnc:commodity-get-printname parent-currency))
+ ; (gnc-commodity-get-printname parent-currency))
(for-each
(lambda (s)
(let* ((s-account (gnc:split-get-account s))
(s-amount (gnc:split-get-amount s))
(s-value (gnc:split-get-value s))
- (s-commodity (gnc:account-get-commodity s-account)))
+ (s-commodity (xaccAccountGetCommodity s-account)))
;; Check if this is a dangling split
;; and print a warning
(if (not s-account)
@@ -290,12 +290,12 @@
(if (not (split-in-list? s seen-split-list))
(begin
(set! seen-split-list (cons s seen-split-list))
- (if (gnc:numeric-negative-p s-value)
+ (if (gnc-numeric-negative-p s-value)
(let ((pair (account-in-alist s-account money-in-alist)))
- ;(gnc:debug "in:" (gnc:commodity-get-printname s-commodity)
- ; (gnc:numeric-to-double s-amount)
- ; (gnc:commodity-get-printname parent-currency)
- ; (gnc:numeric-to-double s-value))
+ ;(gnc:debug "in:" (gnc-commodity-get-printname s-commodity)
+ ; (gnc-numeric-to-double s-amount)
+ ; (gnc-commodity-get-printname parent-currency)
+ ; (gnc-numeric-to-double s-value))
(if (not pair)
(begin
(set! pair (list s-account (gnc:make-commodity-collector)))
@@ -306,17 +306,17 @@
)
(let ((s-account-in-collector (cadr pair))
(s-report-value (to-report-currency parent-currency
- (gnc:numeric-neg s-value)
+ (gnc-numeric-neg s-value)
(gnc:transaction-get-date-posted
parent))))
(money-in-collector 'add report-currency s-report-value)
(s-account-in-collector 'add report-currency s-report-value))
)
(let ((pair (account-in-alist s-account money-out-alist)))
- ;(gnc:debug "out:" (gnc:commodity-get-printname s-commodity)
- ; (gnc:numeric-to-double s-amount)
- ; (gnc:commodity-get-printname parent-currency)
- ; (gnc:numeric-to-double s-value))
+ ;(gnc:debug "out:" (gnc-commodity-get-printname s-commodity)
+ ; (gnc-numeric-to-double s-amount)
+ ; (gnc-commodity-get-printname parent-currency)
+ ; (gnc-numeric-to-double s-value))
(if (not pair)
(begin
(set! pair (list s-account (gnc:make-commodity-collector)))
Modified: gnucash/branches/swig-redo/src/report/standard-reports/category-barchart.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/category-barchart.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/category-barchart.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -243,7 +243,7 @@
;; created.
(date-string-list
(map (lambda (date-list-item)
- (gnc:print-date
+ (gnc-print-date
(if do-intervals?
(car date-list-item)
date-list-item)))
@@ -257,7 +257,7 @@
(define (collector->double c date)
;; Future improvement: Let the user choose which kind of
;; currency combining she want to be done.
- (gnc:numeric-to-double
+ (gnc-numeric-to-double
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
c report-currency
@@ -406,8 +406,8 @@
(if do-intervals?
(_ "%s to %s")
(_ "Balances %s to %s"))
- (gnc:print-date from-date-tp)
- (gnc:print-date to-date-tp)))
+ (gnc-print-date from-date-tp)
+ (gnc-print-date to-date-tp)))
(gnc:html-barchart-set-width! chart width)
(gnc:html-barchart-set-height! chart height)
@@ -416,7 +416,7 @@
;; FIXME: axis labels are not yet supported by
;; libguppitank.
(gnc:html-barchart-set-y-axis-label!
- chart (gnc:commodity-get-mnemonic report-currency))
+ chart (gnc-commodity-get-mnemonic report-currency))
(gnc:html-barchart-set-row-labels-rotated?! chart #t)
(gnc:html-barchart-set-stacked?! chart stacked?)
;; If this is a stacked barchart, then reverse the legend.
Modified: gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -170,7 +170,7 @@
(define (get-split-value split date)
(monetary->double
(gnc:make-gnc-monetary
- (gnc:account-get-commodity (gnc:split-get-account split))
+ (xaccAccountGetCommodity (gnc:split-get-account split))
(gnc:split-get-amount split))
date))
@@ -318,7 +318,7 @@
(gnc-get-current-group)))))
(define (monetary->double foreign-monetary date)
- (gnc:numeric-to-double
+ (gnc-numeric-to-double
(gnc:gnc-monetary-amount
(exchange-fn foreign-monetary report-currency date))))
@@ -378,7 +378,7 @@
;; initialize the query to find splits in the right
;; date range and accounts
- (gnc:query-set-book query (gnc-get-current-book))
+ (qof-query-set-book query (gnc-get-current-book))
;; for balance purposes, we don't need to do this, but it cleans up
;; the table display.
@@ -403,14 +403,14 @@
(delete-duplicates (append accounts subaccts)))))
(gnc:report-percent-done 30)
- (gnc:query-add-account-match query accounts 'guid-match-any 'query-and)
+ (gnc:query-add-account-match query accounts QOF-GUID-MATCH-ANY QOF-QUERY-AND)
;; match splits between start and end dates
(gnc:query-add-date-match-timepair
- query #t from-date-tp #t to-date-tp 'query-and)
- (gnc:query-set-sort-order query
- (list gnc:split-trans gnc:trans-date-posted)
- (list gnc:query-default-sort)
+ query #t from-date-tp #t to-date-tp QOF-QUERY-AND)
+ (qof-query-set-sort-order query
+ (list SPLIT-TRANS TRANS-DATE-POSTED)
+ (list QUERY-DEFAULT-SORT)
'())
;; get the query results
@@ -427,7 +427,7 @@
(gnc:report-percent-done 50)
(set! startbal
- (gnc:numeric-to-double
+ (gnc-numeric-to-double
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
startbal
@@ -464,9 +464,9 @@
(car p)
" - "
(xaccPrintAmount
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
(cadr p)
- (gnc:commodity-get-fraction report-currency)
+ (gnc-commodity-get-fraction report-currency)
GNC-RND-ROUND)
print-info))
(car p)))
@@ -482,16 +482,16 @@
chart (string-append
(sprintf #f
(_ "%s to %s")
- (gnc:print-date from-date-tp)
- (gnc:print-date to-date-tp))
+ (gnc-print-date from-date-tp)
+ (gnc-print-date to-date-tp))
(if show-total?
(let ((total (apply + daily-totals)))
(sprintf
#f ": %s"
(xaccPrintAmount
- (gnc:double-to-gnc-numeric
+ (double-to-gnc-numeric
total
- (gnc:commodity-get-fraction report-currency)
+ (gnc-commodity-get-fraction report-currency)
GNC-RND-ROUND)
print-info)))
"")))
Modified: gnucash/branches/swig-redo/src/report/standard-reports/equity-statement.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/equity-statement.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/equity-statement.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -280,8 +280,8 @@
(string-append "%s %s "
(_ "For Period Covering %s to %s"))
company-name report-title
- (gnc:print-date start-date-printable)
- (gnc:print-date end-date-tp)))
+ (gnc-print-date start-date-printable)
+ (gnc-print-date end-date-tp)))
(if (null? accounts)
@@ -344,8 +344,8 @@
(period-for (if terse-period?
(string-append " " (_ "for Period"))
(sprintf #f (string-append ", " (_ "%s to %s"))
- (gnc:print-date start-date-printable)
- (gnc:print-date end-date-tp))
+ (gnc-print-date start-date-printable)
+ (gnc-print-date end-date-tp))
))
)
@@ -355,7 +355,7 @@
exchange-fn rule? row-style)
(let* ((neg? (and amount
neg-label
- (gnc:numeric-negative-p
+ (gnc-numeric-negative-p
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
amount report-commodity exchange-fn)))))
@@ -371,7 +371,7 @@
(or (and (gnc:uniform-commodity? pos-bal report-commodity)
bal)
(and show-fcur?
- (gnc:commodity-table
+ (gnc-commodity-table
pos-bal report-commodity exchange-fn))
bal
))
@@ -413,7 +413,7 @@
report-commodity
weighted-fn)))
- (unrealized-gain (gnc:numeric-sub-fixed value cost)))
+ (unrealized-gain (gnc-numeric-sub-fixed value cost)))
(unrealized-gain-collector 'add report-commodity unrealized-gain)
unrealized-gain-collector
@@ -586,7 +586,7 @@
(report-line
build-table
(string-append (_ "Capital") ", "
- (gnc:print-date start-date-printable))
+ (gnc-print-date start-date-printable))
#f start-total-equity
1 start-exchange-fn #f "primary-subheading"
)
@@ -611,7 +611,7 @@
withdrawals
0 end-exchange-fn #f #f
)
- (or (gnc:commodity-collector-allzero? net-unrealized-gains)
+ (or (gnc-commodity-collector-allzero? net-unrealized-gains)
(report-line
build-table
(_ "Unrealized Gains")
@@ -630,7 +630,7 @@
(report-line
build-table
(string-append (_ "Capital") ", "
- (gnc:print-date end-date-tp))
+ (gnc-print-date end-date-tp))
#f
end-total-equity
1 end-exchange-fn #f "primary-subheading"
@@ -643,8 +643,8 @@
(and show-rates?
(let* ((curr-tbl (gnc:make-html-table))
(headers (list
- (gnc:print-date start-date-printable)
- (gnc:print-date end-date-tp)
+ (gnc-print-date start-date-printable)
+ (gnc-print-date end-date-tp)
)
)
(then (gnc:html-make-exchangerates
Modified: gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -60,19 +60,19 @@
;; however, may be of issue here. Since I don't know if the
;; Register Report properly ignores voided transactions, I'll err
;; on the side of safety by excluding them from the query....
- (gnc:query-set-book query (gnc-get-current-book))
+ (qof-query-set-book query (gnc-get-current-book))
(gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
- (gnc:query-set-sort-order query
- (list gnc:split-trans gnc:trans-date-posted)
- (list gnc:query-default-sort)
+ (qof-query-set-sort-order query
+ (list SPLIT-TRANS TRANS-DATE-POSTED)
+ (list QUERY-DEFAULT-SORT)
'())
(gnc:query-set-sort-increasing query #t #t #t)
(gnc:query-add-account-match
query
- (gnc:group-get-subaccounts (gnc:book-get-template-group (gnc-get-current-book)))
- 'guid-match-none
- 'query-and)
+ (gnc:group-get-subaccounts (gnc-book-get-template-group (gnc-get-current-book)))
+ QOF-GUID-MATCH-NONE
+ QOF-QUERY-AND)
;; set the "__reg" options required by the Register Report...
(for-each
Modified: gnucash/branches/swig-redo/src/report/standard-reports/income-statement.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/income-statement.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/income-statement.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -360,7 +360,7 @@
(define allow-same-column-totals #t)
(let* ((neg? (and signed-balance
neg-label
- (gnc:numeric-negative-p
+ (gnc-numeric-negative-p
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
signed-balance report-commodity exchange-fn)))))
@@ -397,8 +397,8 @@
(string-append "%s %s "
(_ "For Period Covering %s to %s"))
company-name report-title
- (gnc:print-date start-date-printable)
- (gnc:print-date end-date-tp)))
+ (gnc-print-date start-date-printable)
+ (gnc-print-date end-date-tp)))
(if (null? accounts)
@@ -431,8 +431,8 @@
(period-for (if terse-period?
(string-append " " (_ "for Period"))
(sprintf #f (string-append ", " (_ "%s to %s"))
- (gnc:print-date start-date-printable)
- (gnc:print-date end-date-tp))
+ (gnc-print-date start-date-printable)
+ (gnc-print-date end-date-tp))
)
)
)
@@ -443,7 +443,7 @@
exchange-fn rule? row-style)
(let* ((neg? (and amount
neg-label
- (gnc:numeric-negative-p
+ (gnc-numeric-negative-p
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
amount report-commodity exchange-fn)))))
@@ -459,7 +459,7 @@
(or (and (gnc:uniform-commodity? pos-bal report-commodity)
bal)
(and show-fcur?
- (gnc:commodity-table
+ (gnc-commodity-table
pos-bal report-commodity exchange-fn))
bal
))
Modified: gnucash/branches/swig-redo/src/report/standard-reports/net-barchart.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/net-barchart.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/net-barchart.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -193,7 +193,7 @@
;; 'report-currency' according to the exchange-fn. Returns a
;; double.
(define (collector->double c date)
- (gnc:numeric-to-double
+ (gnc-numeric-to-double
(gnc:gnc-monetary-amount
(gnc:sum-collector-commodity
c report-currency
@@ -246,9 +246,9 @@
(date-string-list (map
(if inc-exp?
(lambda (date-list-item)
- (gnc:print-date
+ (gnc-print-date
(car date-list-item)))
- gnc:print-date)
+ gnc-print-date)
dates-list)))
(set! assets-list
@@ -274,13 +274,13 @@
(gnc:html-barchart-set-subtitle!
chart (sprintf #f
(_ "%s to %s")
- (gnc:print-date from-date-tp)
- (gnc:print-date to-date-tp)))
+ (gnc-print-date from-date-tp)
+ (gnc-print-date to-date-tp)))
(gnc:html-barchart-set-width! chart width)
(gnc:html-barchart-set-height! chart height)
(gnc:html-barchart-set-row-labels! chart date-string-list)
(gnc:html-barchart-set-y-axis-label!
- chart (gnc:commodity-get-mnemonic report-currency))
+ chart (gnc-commodity-get-mnemonic report-currency))
;; Determine whether we have enough space for horizontal labels
;; -- kind of a hack. Assumptions: y-axis labels and legend
;; require 200 pixels, and each x-axes label needs 60 pixels.
Modified: gnucash/branches/swig-redo/src/report/standard-reports/portfolio.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/portfolio.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/portfolio.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -119,9 +119,9 @@
(let* ((row-style (if odd-row? "normal-row" "alternate-row"))
(current (car accounts))
(rest (cdr accounts))
- (commodity (gnc:account-get-commodity current))
- (ticker-symbol (gnc:commodity-get-mnemonic commodity))
- (listing (gnc:commodity-get-namespace commodity))
+ (commodity (xaccAccountGetCommodity current))
+ (ticker-symbol (gnc-commodity-get-mnemonic commodity))
+ (listing (gnc-commodity-get-namespace commodity))
(unit-collector (gnc:account-get-comm-balance-at-date
current to-date #f))
(units (cadr (unit-collector 'getpair commodity #f)))
@@ -132,7 +132,7 @@
(set! work-done (+ 1 work-done))
(gnc:report-percent-done (* 100 (/ work-done work-to-do)))
- (if (or include-empty (not (gnc:numeric-zero-p units)))
+ (if (or include-empty (not (gnc-numeric-zero-p units)))
(begin (collector 'add currency (gnc:gnc-monetary-amount value))
(gnc:html-table-append-row/markup!
table
@@ -147,11 +147,11 @@
"number-cell"
(gnc:html-price-anchor
(car price-info)
- (gnc:make-gnc-monetary (gnc:price-get-currency (car price-info))
- (gnc:price-get-value (car price-info)))))
+ (gnc:make-gnc-monetary (gnc-price-get-currency (car price-info))
+ (gnc-price-get-value (car price-info)))))
(gnc:make-html-table-header-cell/markup
"number-cell" value)))
- ;;(display (sprintf #f "Shares: %6.6d " (gnc:numeric-to-double units)))
+ ;;(display (sprintf #f "Shares: %6.6d " (gnc-numeric-to-double units)))
;;(display units) (newline)
(table-add-stock-rows-internal rest (not odd-row?)))
(table-add-stock-rows-internal rest odd-row?)))))
@@ -184,7 +184,7 @@
(gnc:html-document-set-title!
document (string-append
report-title
- (sprintf #f " %s" (gnc:print-date to-date))))
+ (sprintf #f " %s" (gnc-print-date to-date))))
;(gnc:debug "accounts" accounts)
(if (not (null? accounts))
@@ -192,7 +192,7 @@
(append
(gnc:acccounts-get-all-subaccounts
accounts) accounts) currency))
- (pricedb (gnc:book-get-pricedb (gnc-get-current-book)))
+ (pricedb (gnc-pricedb-get-db (gnc-get-current-book)))
(exchange-fn (gnc:case-exchange-fn price-source currency to-date))
(price-fn
(case price-source
@@ -206,21 +206,21 @@
((pricedb-latest)
(lambda (foreign date)
(let ((price
- (gnc:pricedb-lookup-latest-any-currency
+ (gnc-pricedb-lookup-latest-any-currency
pricedb foreign)))
(if (and price (> (length price) 0))
- (let ((v (gnc:price-get-value (car price))))
+ (let ((v (gnc-price-get-value (car price))))
(cons (car price) v))
- (cons #f (gnc:numeric-zero))))))
+ (cons #f (gnc-numeric-zero))))))
((pricedb-nearest)
(lambda (foreign date)
(let ((price
- (gnc:pricedb-lookup-nearest-in-time-any-currency
- pricedb foreign (gnc:timepair-canonical-day-time date))))
+ (gnc-pricedb-lookup-nearest-in-time-any-currency
+ pricedb foreign (timespecCanonicalDayTime date))))
(if (and price (> (length price) 0))
- (let ((v (gnc:price-get-value (car price))))
+ (let ((v (gnc-price-get-value (car price))))
(cons (car price) v))
- (cons #f (gnc:numeric-zero)))))))))
+ (cons #f (gnc-numeric-zero)))))))))
(gnc:html-table-set-col-headers!
table
Modified: gnucash/branches/swig-redo/src/report/standard-reports/price-scatter.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/price-scatter.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/price-scatter.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -182,12 +182,12 @@
chart report-title)
(gnc:html-scatter-set-subtitle!
chart (string-append
- (gnc:commodity-get-mnemonic price-commodity)
+ (gnc-commodity-get-mnemonic price-commodity)
" - "
(sprintf #f
(_ "%s to %s")
- (gnc:print-date from-date-tp)
- (gnc:print-date to-date-tp))))
+ (gnc-print-date from-date-tp)
+ (gnc-print-date to-date-tp))))
(gnc:html-scatter-set-width! chart width)
(gnc:html-scatter-set-height! chart height)
(gnc:html-scatter-set-marker! chart
@@ -200,7 +200,7 @@
((filledsquare) "filled square")))
(gnc:html-scatter-set-markercolor! chart mcolor)
(gnc:html-scatter-set-y-axis-label!
- chart (gnc:commodity-get-mnemonic report-currency))
+ chart (gnc-commodity-get-mnemonic report-currency))
(gnc:html-scatter-set-x-axis-label!
chart (case interval
((DayDelta) (N_ "Days"))
@@ -210,7 +210,7 @@
((YearDelta) (N_ "Years"))))
(if
- (not (gnc:commodity-equiv? report-currency price-commodity))
+ (not (gnc-commodity-equiv report-currency price-commodity))
(begin
(if (not (null? currency-accounts))
(set!
@@ -226,10 +226,10 @@
price-commodity report-currency))
((pricedb)
(map (lambda (p)
- (list (gnc:price-get-time p)
- (gnc:price-get-value p)))
- (gnc:pricedb-get-prices
- (gnc:book-get-pricedb (gnc-get-current-book))
+ (list (gnc-price-get-time p)
+ (gnc-price-get-value p)))
+ (gnc-pricedb-get-prices
+ (gnc-pricedb-get-db (gnc-get-current-book))
price-commodity report-currency)))
)))
@@ -242,14 +242,14 @@
;; some output
;;(warn "data" (map (lambda (x) (list
- ;; (gnc:print-date (car x))
- ;; (gnc:numeric-to-double (second x))))
+ ;; (gnc-print-date (car x))
+ ;; (gnc-numeric-to-double (second x))))
;; data))
;; convert the gnc:numeric's to doubles
(set! data (map (lambda (x)
(list (first x)
- (gnc:numeric-to-double (second x))))
+ (gnc-numeric-to-double (second x))))
data))
;; convert the dates to the weird x-axis scaling of the
Modified: gnucash/branches/swig-redo/src/report/standard-reports/register.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/register.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/register.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -117,7 +117,7 @@
(let ((account (gnc:split-get-account split))
(balance (gnc:split-get-balance split)))
(if (and account (gnc-reverse-balance account))
- (gnc:numeric-neg balance)
+ (gnc-numeric-neg balance)
balance)))
(define (add-split-row table split column-vector row-style
@@ -126,7 +126,7 @@
(parent (gnc:split-get-parent split))
(account (gnc:split-get-account split))
(currency (if account
- (gnc:account-get-commodity account)
+ (xaccAccountGetCommodity account)
(gnc-default-currency)))
(damount (gnc:split-get-amount split))
(split-value (gnc:make-gnc-monetary currency damount)))
@@ -134,7 +134,7 @@
(if (date-col column-vector)
(addto! row-contents
(if transaction-info?
- (gnc:print-date
+ (gnc-print-date
(gnc:transaction-get-date-posted parent))
" ")))
(if (num-col column-vector)
@@ -182,7 +182,7 @@
(gnc:html-split-anchor split split-value))
" ")))
(if (debit-col column-vector)
- (if (gnc:numeric-positive-p (gnc:gnc-monetary-amount split-value))
+ (if (gnc-numeric-positive-p (gnc:gnc-monetary-amount split-value))
(addto! row-contents
(if split-info?
(gnc:make-html-table-cell/markup
@@ -191,7 +191,7 @@
" "))
(addto! row-contents " ")))
(if (debit-col column-vector)
- (if (gnc:numeric-negative-p (gnc:gnc-monetary-amount split-value))
+ (if (gnc-numeric-negative-p (gnc:gnc-monetary-amount split-value))
(addto! row-contents
(if split-info?
(gnc:make-html-table-cell/markup
@@ -337,7 +337,7 @@
(define (colspan monetary)
(cond
((amount-single-col used-columns) (amount-single-col used-columns))
- ((gnc:numeric-negative-p (gnc:gnc-monetary-amount monetary))
+ ((gnc-numeric-negative-p (gnc:gnc-monetary-amount monetary))
(credit-col used-columns))
(else (debit-col used-columns))))
@@ -346,7 +346,7 @@
(if (and leader (gnc-reverse-balance leader))
(gnc:monetary-neg monetary)
monetary)
- (if (gnc:numeric-negative-p (gnc:gnc-monetary-amount monetary))
+ (if (gnc-numeric-negative-p (gnc:gnc-monetary-amount monetary))
(gnc:monetary-neg monetary)
monetary)))
@@ -429,12 +429,12 @@
(gnc:gnc-monetary-commodity split-value)
(gnc:gnc-monetary-amount split-value))
- (if (gnc:numeric-positive-p (gnc:gnc-monetary-amount split-value))
+ (if (gnc-numeric-positive-p (gnc:gnc-monetary-amount split-value))
(debit-collector 'add
(gnc:gnc-monetary-commodity split-value)
(gnc:gnc-monetary-amount split-value)))
- (if (gnc:numeric-negative-p (gnc:gnc-monetary-amount split-value))
+ (if (gnc-numeric-negative-p (gnc:gnc-monetary-amount split-value))
(credit-collector 'add
(gnc:gnc-monetary-commodity split-value)
(gnc:gnc-monetary-amount split-value)))
@@ -532,7 +532,7 @@
(list
(string-append
(_ "Date") ": "
- (string-expand (gnc:print-date (cons (current-time) 0))
+ (string-expand (gnc-print-date (cons (current-time) 0))
#\space " "))
(make-client-table address)))
(set-last-row-style!
@@ -561,7 +561,7 @@
(set! query (gnc:scm->query query-scm))
- (gnc:query-set-book query (gnc-get-current-book))
+ (qof-query-set-book query (gnc-get-current-book))
(set! splits (if journal?
(gnc:query-get-splits-unique-trans query)
Modified: gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -419,7 +419,7 @@
(account (gnc:split-get-account split))
(account-type (xaccAccountGetType account))
(currency (if account
- (gnc:account-get-commodity account)
+ (xaccAccountGetCommodity account)
(gnc-default-currency)))
(report-currency (if (opt-val gnc:pagename-general optname-common-currency)
(opt-val gnc:pagename-general optname-currency)
@@ -432,25 +432,25 @@
(gnc:make-gnc-monetary
currency
(if (member account-type account-types-to-reverse)
- (gnc:numeric-neg damount)
+ (gnc-numeric-neg damount)
damount))
report-currency
;; Use midday as the transaction time so it matches a price
;; on the same day. Otherwise it uses midnight which will
;; likely match a price on the previous day
- (gnc:timepair-canonical-day-time trans-date))))
+ (timespecCanonicalDayTime trans-date))))
(if (used-date column-vector)
(addto! row-contents
(if transaction-row?
- (gnc:print-date (gnc:transaction-get-date-posted parent))
+ (gnc-print-date (gnc:transaction-get-date-posted parent))
" ")))
(if (used-reconciled-date column-vector)
(addto! row-contents
(let ((date (gnc:split-get-reconciled-date split)))
(if (equal? date (cons 0 0))
" "
- (gnc:print-date date)))))
+ (gnc-print-date date)))))
(if (used-num column-vector)
(addto! row-contents
(if transaction-row?
@@ -484,20 +484,20 @@
(if (used-price column-vector)
(addto!
row-contents
- (gnc:make-gnc-monetary (gnc:transaction-get-currency parent)
+ (gnc:make-gnc-monetary (xaccTransGetCurrency parent)
(gnc:split-get-share-price split))))
(if (used-amount-single column-vector)
(addto! row-contents
(gnc:make-html-table-cell/markup "number-cell"
(gnc:html-transaction-anchor parent split-value))))
(if (used-amount-double-positive column-vector)
- (if (gnc:numeric-positive-p (gnc:gnc-monetary-amount split-value))
+ (if (gnc-numeric-positive-p (gnc:gnc-monetary-amount split-value))
(addto! row-contents
(gnc:make-html-table-cell/markup "number-cell"
(gnc:html-transaction-anchor parent split-value)))
(addto! row-contents " ")))
(if (used-amount-double-negative column-vector)
- (if (gnc:numeric-negative-p (gnc:gnc-monetary-amount split-value))
+ (if (gnc-numeric-negative-p (gnc:gnc-monetary-amount split-value))
(addto! row-contents
(gnc:make-html-table-cell/markup
"number-cell" (gnc:html-transaction-anchor parent (gnc:monetary-neg split-value))))
@@ -853,8 +853,8 @@
(define (display-date-interval begin end)
- (let ((begin-string (gnc:print-date begin))
- (end-string (gnc:print-date end)))
+ (let ((begin-string (gnc-print-date begin))
+ (end-string (gnc-print-date end)))
(sprintf #f (_ "From %s To %s") begin-string end-string)))
(define (get-primary-subtotal-style options)
@@ -1119,43 +1119,43 @@
;; (let* ((used-columns (build-column-used options))) ;; tpo: gives unbound variable options?
(let* ((used-columns (build-column-used (gnc:report-options report-obj))))
(list (cons 'account-name (vector
- (list gnc:split-account-fullname)
+ (list SPLIT-ACCT-FULLNAME)
split-account-full-name-same-p
render-account-subheading
render-account-subtotal))
(cons 'account-code (vector
- (list gnc:split-account gnc:account-code)
+ (list SPLIT-ACCOUNT ACCOUNT-CODE-)
split-account-code-same-p
render-account-subheading
render-account-subtotal))
(cons 'exact-time (vector
- (list gnc:split-trans gnc:trans-date-posted)
+ (list SPLIT-TRANS TRANS-DATE-POSTED)
#f #f #f))
(cons 'date (vector
- (list gnc:split-trans gnc:trans-date-posted)
+ (list SPLIT-TRANS TRANS-DATE-POSTED)
#f #f #f))
(cons 'reconciled-date (vector
- (list gnc:split-date-reconciled)
+ (list SPLIT-DATE-RECONCILED)
#f #f #f))
(cons 'register-order (vector
- (list gnc:query-default-sort)
+ (list QUERY-DEFAULT-SORT)
#f #f #f))
(cons 'corresponding-acc-name
(vector
- (list gnc:split-corr-account-fullname)
+ (list SPLIT-CORR-ACCT-FULLNAME)
split-same-corr-account-full-name-p
render-corresponding-account-subheading
render-corresponding-account-subtotal))
(cons 'corresponding-acc-code
(vector
- (list gnc:split-corr-account-code)
+ (list SPLIT-CORR-ACCT-CODE)
split-same-corr-account-code-p
render-corresponding-account-subheading
render-corresponding-account-subtotal))
- (cons 'amount (vector (list gnc:split-value) #f #f #f))
- (cons 'description (vector (list gnc:split-trans gnc:trans-desc) #f #f #f))
- (cons 'number (vector (list gnc:split-trans gnc:trans-num) #f #f #f))
- (cons 'memo (vector (list gnc:split-memo) #f #f #f))
+ (cons 'amount (vector (list SPLIT-VALUE) #f #f #f))
+ (cons 'description (vector (list SPLIT-TRANS TRANS-DESCRIPTION) #f #f #f))
+ (cons 'number (vector (list SPLIT-TRANS TRANS-NUM) #f #f #f))
+ (cons 'memo (vector (list SPLIT-MEMO) #f #f #f))
(cons 'none (vector '() #f #f #f)))))
(define date-comp-funcs-assoc-list
@@ -1280,14 +1280,14 @@
(if (not (or (null? c_account_1) (and-map not c_account_1)))
(begin
- (gnc:query-set-book query (gnc-get-current-book))
+ (qof-query-set-book query (gnc-get-current-book))
;;(gnc:warn "query is:" query)
(gnc:query-add-account-match query
c_account_1
- 'guid-match-any 'query-and)
+ QOF-GUID-MATCH-ANY QOF-QUERY-AND)
(gnc:query-add-date-match-timepair
- query #t begindate #t enddate 'query-and)
- (gnc:query-set-sort-order query
+ query #t begindate #t enddate QOF-QUERY-AND)
+ (qof-query-set-sort-order query
(get-query-sortkey primary-key)
(get-query-sortkey secondary-key)
'())
Modified: gnucash/branches/swig-redo/src/report/standard-reports/trial-balance.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/standard-reports/trial-balance.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/standard-reports/trial-balance.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -387,8 +387,8 @@
(period-for (if terse-period?
(string-append " " (_ "for Period"))
(sprintf #f (string-append ", " (_ "%s to %s"))
- (gnc:print-date start-date-printable)
- (gnc:print-date end-date-tp))
+ (gnc-print-date start-date-printable)
+ (gnc-print-date end-date-tp))
))
)
@@ -396,12 +396,12 @@
doc (if (equal? report-variant 'current)
(sprintf #f (string-append "%s %s %s")
company-name report-title
- (gnc:print-date end-date-tp))
+ (gnc-print-date end-date-tp))
(sprintf #f (string-append "%s %s "
(_ "For Period Covering %s to %s"))
company-name report-title
- (gnc:print-date start-date-printable)
- (gnc:print-date end-date-tp))
+ (gnc-print-date start-date-printable)
+ (gnc-print-date end-date-tp))
)
)
@@ -487,7 +487,7 @@
(define (tot-abs-amt-cell amt)
(let* ((neg-amt (gnc:make-commodity-collector))
(rv (report-val amt))
- (neg? (gnc:numeric-negative-p
+ (neg? (gnc-numeric-negative-p
(gnc:gnc-monetary-amount rv)))
(cell #f)
)
@@ -547,7 +547,7 @@
report-commodity
weighted-fn)))
- (unrealized-gain (gnc:numeric-sub-fixed value cost)))
+ (unrealized-gain (gnc-numeric-sub-fixed value cost)))
(unrealized-gain-collector 'add report-commodity unrealized-gain)
)
@@ -820,7 +820,7 @@
;;
;; we omit unrealized gains from the balance report, if
;; zero, since they are not present on normal trial balances
- (and (not (gnc:commodity-collector-allzero?
+ (and (not (gnc-commodity-collector-allzero?
unrealized-gain-collector))
(let* ((ug-row (+ header-rows
(gnc:html-acct-table-num-rows
Modified: gnucash/branches/swig-redo/src/report/stylesheets/stylesheet-easy.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/stylesheets/stylesheet-easy.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/stylesheets/stylesheet-easy.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -327,7 +327,7 @@
(gnc:html-markup-b prepared-for)
(gnc:html-markup-br)
(_ "Date: ")
- (gnc:print-date
+ (gnc-print-date
(cons (current-time) 0)))
;; title only
Modified: gnucash/branches/swig-redo/src/report/stylesheets/stylesheet-fancy.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/stylesheets/stylesheet-fancy.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/stylesheets/stylesheet-fancy.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -322,7 +322,7 @@
(gnc:html-markup-b prepared-for)
(gnc:html-markup-br)
(_ "Date: ")
- (gnc:print-date
+ (gnc-print-date
(cons (current-time) 0)))
;; title only
Modified: gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm
===================================================================
--- gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/report/utility-reports/hello-world.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -249,7 +249,7 @@
;; these are samples of different date options. for a simple
;; date with day, month, and year but no time you should use
- ;; gnc:print-date
+ ;; gnc-print-date
(let ((time-string (strftime "%X" (localtime (current-time))))
(date-string (strftime "%x" (localtime (car date-val))))
(date-string2 (strftime "%x %X" (localtime (car date2-val))))
Modified: gnucash/branches/swig-redo/src/scm/command-line.scm
===================================================================
--- gnucash/branches/swig-redo/src/scm/command-line.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/scm/command-line.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -84,7 +84,7 @@
where 'default expands to the default path, and 'current expands to \
the current value of the path.")
(let ((result (cons
- (gnc:build-dotgnucash-path "html")
+ (gnc-build-dotgnucash-path "html")
gnc:_install-doc-path_)))
(lambda () result))))
Modified: gnucash/branches/swig-redo/src/scm/main-window.scm
===================================================================
--- gnucash/branches/swig-redo/src/scm/main-window.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/scm/main-window.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -30,12 +30,12 @@
(define (gnc:main-window-properties-cb)
(let* ((book (gnc-get-current-book))
- (slots (gnc:book-get-slots book)))
+ (slots (gnc-book-get-slots book)))
(define (changed_cb)
- (gnc:book-kvp-changed book))
+ (qof-book-kvp-changed book))
- (gnc:kvp-option-dialog gnc:id-book
+ (gnc:kvp-option-dialog QOF-ID-BOOK-SCM
slots (_ "Book Options")
changed_cb)))
Modified: gnucash/branches/swig-redo/src/scm/price-quotes.scm
===================================================================
--- gnucash/branches/swig-redo/src/scm/price-quotes.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/scm/price-quotes.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -396,7 +396,7 @@
;; (commodity-4 currency-4 tz-4) ...)
;; ...)
- (let* ((ct (gnc:book-get-commodity-table book))
+ (let* ((ct (gnc-commodity-table-get-table book))
(big-list
(gnc-commodity-table-get-quotable-commodities
ct))
@@ -444,14 +444,14 @@
(if (equal? (car fq-call-data) "currency")
(map (lambda (quote-item-info)
(list (car fq-call-data)
- (gnc:commodity-get-mnemonic (car quote-item-info))
- (gnc:commodity-get-mnemonic (cadr quote-item-info))))
+ (gnc-commodity-get-mnemonic (car quote-item-info))
+ (gnc-commodity-get-mnemonic (cadr quote-item-info))))
(cdr fq-call-data))
(list
(cons (car fq-call-data)
(map
(lambda (quote-item-info)
- (gnc:commodity-get-mnemonic (car quote-item-info)))
+ (gnc-commodity-get-mnemonic (car quote-item-info)))
(cdr fq-call-data))))))
(define (fq-results->commod-tz-quote-triples fq-call-data fq-results)
@@ -538,11 +538,11 @@
(price #f)
(price-type #f)
(currency-str (assq-ref quote-data 'currency))
- (commodity-table (gnc:book-get-commodity-table book))
+ (commodity-table (gnc-commodity-table-get-table book))
(currency
(and commodity-table
(string? currency-str)
- (gnc:commodity-table-lookup commodity-table
+ (gnc-commodity-table-lookup commodity-table
"ISO4217"
(string-upcase currency-str)))))
@@ -565,7 +565,7 @@
;; FIXME: SIGFIGS is not what we want here...
(if price
(set! price
- (gnc:double-to-gnc-numeric price
+ (double-to-gnc-numeric price
GNC-DENOM-AUTO
(logior (GNC-DENOM-SIGFIGS 9)
GNC-RND-ROUND))))
@@ -576,32 +576,32 @@
(if (not (and commodity currency gnc-time price price-type))
(string-append
- currency-str ":" (gnc:commodity-get-mnemonic commodity))
- (let ((gnc-price (gnc:price-create book)))
+ currency-str ":" (gnc-commodity-get-mnemonic commodity))
+ (let ((gnc-price (gnc-price-create book)))
(if (not gnc-price)
(string-append
- currency-str ":" (gnc:commodity-get-mnemonic commodity))
+ currency-str ":" (gnc-commodity-get-mnemonic commodity))
(begin
- (gnc:price-set-commodity gnc-price commodity)
- (gnc:price-set-currency gnc-price currency)
- (gnc:price-set-time gnc-price gnc-time)
- (gnc:price-set-source gnc-price "Finance::Quote")
- (gnc:price-set-type gnc-price price-type)
- (gnc:price-set-value gnc-price price)
+ (gnc-price-set-commodity gnc-price commodity)
+ (gnc-price-set-currency gnc-price currency)
+ (gnc-price-set-time gnc-price gnc-time)
+ (gnc-price-set-source gnc-price "Finance::Quote")
+ (gnc-price-set-type gnc-price price-type)
+ (gnc-price-set-value gnc-price price)
gnc-price))))))
(define (book-add-prices! book prices)
- (let ((pricedb (gnc:book-get-pricedb book)))
+ (let ((pricedb (gnc-pricedb-get-db book)))
(for-each
(lambda (price)
- (gnc:pricedb-add-price pricedb price)
- (gnc:price-unref price))
+ (gnc-pricedb-add-price pricedb price)
+ (gnc-price-unref price))
prices)))
;; FIXME: uses of gnc:warn in here need to be cleaned up. Right
;; now, they'll result in funny formatting.
- (let* ((group (gnc:book-get-group book))
+ (let* ((group (xaccGetAccountGroup book))
(fq-call-data (book->commodity->fq-call-data book))
(fq-calls (and fq-call-data
(apply append
@@ -619,9 +619,9 @@
(if (car cq-pair)
#f
(string-append
- (gnc:commodity-get-namespace (cdr cq-pair))
+ (gnc-commodity-get-namespace (cdr cq-pair))
":"
- (gnc:commodity-get-mnemonic (cdr cq-pair)))))
+ (gnc-commodity-get-mnemonic (cdr cq-pair)))))
commod-tz-quote-triples)))
;; strip out the "bad" ones from above.
(ok-syms
@@ -755,4 +755,4 @@
(if (list? sources)
(begin
(gnc:msg "Found Finance::Quote version " (car sources))
- (gnc:quote-source-set-fq-installed (cdr sources))))))
+ (gnc-quote-source-set-fq-installed (cdr sources))))))
Modified: gnucash/branches/swig-redo/src/tax/us/txf-de_DE.scm
===================================================================
--- gnucash/branches/swig-redo/src/tax/us/txf-de_DE.scm 2006-10-10 00:08:39 UTC (rev 14978)
+++ gnucash/branches/swig-redo/src/tax/us/txf-de_DE.scm 2006-10-10 00:09:47 UTC (rev 14979)
@@ -129,4 +129,4 @@
"a" (N_ "The electronic tax number of your business") ""))
)
-(gnc-register-kvp-option-generator gnc:id-book book-options-generator)
+(gnc-register-kvp-option-generator QOF-ID-BOOK-SCM book-options-generator)
More information about the gnucash-changes
mailing list