r14980 - gnucash/branches/swig-redo/src - Automated rename of Query-related swig-wrapped engine functions to
Chris Shoemaker
chris at cvs.gnucash.org
Mon Oct 9 20:10:29 EDT 2006
Author: chris
Date: 2006-10-09 20:10:28 -0400 (Mon, 09 Oct 2006)
New Revision: 14980
Trac: http://svn.gnucash.org/trac/changeset/14980
Modified:
gnucash/branches/swig-redo/src/app-utils/options.scm
gnucash/branches/swig-redo/src/business/business-reports/aging.scm
gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm
gnucash/branches/swig-redo/src/engine/test/test-scm-query-import.scm
gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm
gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm
gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm
gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm
gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm
gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm
gnucash/branches/swig-redo/src/report/standard-reports/register.scm
gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm
Log:
Automated rename of Query-related swig-wrapped engine functions to
their swig-names.
s/gnc:malloc-query/qof-query-create-for-splits/g
s/gnc:free-query/qof-query-destroy/g
s/gnc:query-invert/qof-query-invert/g
s/gnc:query-merge/qof-query-merge/g
s/gnc:query-get-splits/qof-query-run/g
s/gnc:query-get-splits-unique-trans/xaccQueryGetSplitsUniqueTrans/g
s/gnc:query-get-transactions/xaccQueryGetTransactions/g
s/gnc:query-get-lots/xaccQueryGetLots/g
s/gnc:query-add-account-match/xaccQueryAddAccountMatch/g
s/gnc:query-add-single-account-match/xaccQueryAddSingleAccountMatch/g
s/gnc:query-add-description-match/xaccQueryAddDescriptionMatch/g
s/gnc:query-add-value-match/xaccQueryAddValueMatch/g
s/gnc:query-add-date-match-timepair/xaccQueryAddDateMatchTS/g
s/gnc:query-add-date-match/xaccQueryAddDateMatch/g
s/gnc:query-add-cleared-match/xaccQueryAddClearedMatch/g
s/gnc:query-set-sort-increasing/qof-query-set-sort-increasing/g
s/gnc:query-set-max-results/qof-query-set-max-results/g
s/gnc:query->scm/gnc-query2scm/g
s/gnc:scm->query/gnc-scm2query/g
Modified: gnucash/branches/swig-redo/src/app-utils/options.scm
===================================================================
--- gnucash/branches/swig-redo/src/app-utils/options.scm 2006-10-10 00:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/app-utils/options.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -1090,16 +1090,16 @@
default-value)
(let* ((value (if (list? default-value)
default-value
- (gnc:query->scm default-value)))
+ (gnc-query2scm default-value)))
(value->string (lambda ()
(string-append "'" (gnc:value->string value)))))
(gnc:make-option
section name "" 'query #f
(lambda () value)
- (lambda (x) (set! value (if (list? x) x (gnc:query->scm x))))
+ (lambda (x) (set! value (if (list? x) x (gnc-query2scm x))))
(lambda () (if (list? default-value)
default-value
- (gnc:query->scm default-value)))
+ (gnc-query2scm default-value)))
(gnc:restore-form-generator value->string)
#f
#f
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/business/business-reports/aging.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -306,12 +306,12 @@
(gnc:debug "date" date)
(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 QOF-QUERY-AND)
- (gnc:query-add-date-match-timepair query #t begindate #t date QOF-QUERY-AND)
+ (xaccQueryAddSingleAccountMatch query account QOF-QUERY-AND)
+ (xaccQueryAddDateMatchTS 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)))
+ (qof-query-set-sort-increasing query #t #t #t)))
(define (aging-options-generator options)
@@ -533,7 +533,7 @@
(exchange-fn (gnc:case-exchange-fn price-source report-currency report-date))
(total-collector-list (make-collector-list))
(table (gnc:make-html-table))
- (query (gnc:malloc-query))
+ (query (qof-query-create-for-splits))
(company-list '())
(work-done 0)
(work-to-do 0)
@@ -562,7 +562,7 @@
(begin
(setup-query query account report-date)
;; get the appropriate splits
- (let ((splits (gnc:query-get-splits query)))
+ (let ((splits (qof-query-run query)))
; (gnc:debug "splits" splits)
;; build the table
@@ -644,7 +644,7 @@
document
(gnc:make-html-text
(_ "No valid account selected. Click on the Options button and select the account to use."))))
- (gnc:free-query query)
+ (qof-query-destroy query)
(gnc:report-finished)
document))
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/business/business-reports/owner-report.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -126,7 +126,7 @@
(define (make-aging-table options query bucket-intervals reverse?)
- (let ((lots (gnc:query-get-lots query QUERY-TXN-MATCH-ANY))
+ (let ((lots (xaccQueryGetLots query QUERY-TXN-MATCH-ANY))
(buckets (new-bucket-vector))
(payments (gnc-numeric-zero))
(currency (gnc-default-currency)) ;XXX
@@ -273,7 +273,7 @@
(define (make-txn-table options query acc start-date end-date)
- (let ((txns (gnc:query-get-transactions query QUERY-TXN-MATCH-ANY))
+ (let ((txns (xaccQueryGetTransactions query QUERY-TXN-MATCH-ANY))
(used-columns (build-column-used options))
(total (gnc-numeric-zero))
(currency (gnc-default-currency)) ;XXX
@@ -450,8 +450,8 @@
OWNER-PARENTG)
guid QOF-QUERY-OR)
- (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)
+ (xaccQueryAddSingleAccountMatch q account QOF-QUERY-AND)
+ (xaccQueryAddDateMatchTS q #f end-date #t end-date QOF-QUERY-AND)
(qof-query-set-book q (gnc-get-current-book))
q))
@@ -534,7 +534,7 @@
(let* ((document (gnc:make-html-document))
(table '())
(orders '())
- (query (gnc:malloc-query))
+ (query (qof-query-create-for-splits))
(account (opt-val owner-page acct-string))
(owner (opt-val owner-page owner-string))
(start-date (gnc:timepair-start-day-time
@@ -622,7 +622,7 @@
(_ "No valid %s selected. Click on the Options button to select a company.")
(_ type-str))))) ;; FIXME because of translations: Please change this string into full sentences instead of sprintf, because in non-english languages the "no valid" has different forms depending on the grammatical gender of the "%s".
- (gnc:free-query query)
+ (qof-query-destroy query)
document))
(define (find-first-account type)
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/engine/test/test-scm-query-import.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -17,8 +17,8 @@
(for-each
(lambda (query-scm)
- (let* ((q (gnc:scm->query query-scm))
- (q2 (gnc:query->scm q)))
+ (let* ((q (gnc-scm2query query-scm))
+ (q2 (gnc-query2scm q)))
(if (or (null? q) (not q))
(begin
(set! failures #t)
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/import-export/qif-import/qif-merge-groups.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -6,21 +6,21 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (gnc:group-get-transactions group)
- (let ((query (gnc:malloc-query))
+ (let ((query (qof-query-create-for-splits))
(xtns #f))
(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
+ (xaccQueryAddAccountMatch query
(gnc:group-get-subaccounts group)
QOF-GUID-MATCH-ANY QOF-QUERY-AND)
- (set! xtns (gnc:query-get-transactions query QUERY-TXN-MATCH-ALL))
+ (set! xtns (xaccQueryGetTransactions query QUERY-TXN-MATCH-ALL))
;; lose the query
- (gnc:free-query query)
+ (qof-query-destroy query)
xtns))
@@ -51,7 +51,7 @@
;; match possibly similar transactions.
(for-each
(lambda (xtn)
- (let ((query (gnc:malloc-query)))
+ (let ((query (qof-query-create-for-splits)))
(set! work-done (+ 1 work-done))
(if progress-dialog
(begin
@@ -62,22 +62,22 @@
(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
+ (xaccQueryAddAccountMatch query
(gnc:group-get-subaccounts old-group)
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
+ (xaccQueryAddDateMatchTS
query #t (decdate date WeekDelta) #t (incdate date WeekDelta)
QOF-QUERY-AND))
;; for each split in the transaction, add a term to match the
;; properties of one split
- (let ((q-splits (gnc:malloc-query)))
+ (let ((q-splits (qof-query-create-for-splits)))
(for-each
(lambda (split)
- (let ((sq (gnc:malloc-query)))
+ (let ((sq (qof-query-create-for-splits)))
(qof-query-set-book sq (gnc:group-get-book old-group))
;; we want to match the account in the old group that
@@ -85,7 +85,7 @@
;; there's not one (new account), the match will be NULL
;; and we know the query won't find anything. optimize
;; this later.
- (gnc:query-add-single-account-match
+ (xaccQueryAddSingleAccountMatch
sq
(gnc:get-account-from-full-name
old-group (gnc-account-get-full-name
@@ -95,7 +95,7 @@
;; 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
+ (xaccQueryAddValueMatch
sq (gnc:split-get-value split)
QOF-NUMERIC-MATCH-ANY QOF-COMPARE-EQUAL
QOF-QUERY-AND)
@@ -104,22 +104,22 @@
;; 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 QOF-QUERY-OR)))
- (gnc:free-query q-splits)
- (gnc:free-query sq)
+ (let ((q-new (qof-query-merge q-splits sq QOF-QUERY-OR)))
+ (qof-query-destroy q-splits)
+ (qof-query-destroy sq)
(set! q-splits q-new))))
(gnc:transaction-get-splits xtn))
;; 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 QOF-QUERY-AND)))
- (gnc:free-query query)
- (gnc:free-query q-splits)
+ (let ((q-new (qof-query-merge query q-splits QOF-QUERY-AND)))
+ (qof-query-destroy query)
+ (qof-query-destroy 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 (xaccQueryGetTransactions query QUERY-TXN-MATCH-ALL)))
(set! old-xtns (map
(lambda (elt)
(cons elt #f)) old-xtns))
@@ -128,7 +128,7 @@
;; along with the transaction
(if (not (null? old-xtns))
(set! matches (cons (cons xtn old-xtns) matches))))
- (gnc:free-query query)))
+ (qof-query-destroy query)))
new-xtns)
;; get rid of the progress dialog
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/report/report-system/commodity-utilities.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -40,15 +40,15 @@
;; 'commodity' != #f ).
(define (gnc:get-match-commodity-splits
currency-accounts end-date-tp commodity)
- (let ((query (gnc:malloc-query))
+ (let ((query (qof-query-create-for-splits))
(splits #f))
(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
+ (xaccQueryAddAccountMatch query
currency-accounts
QOF-GUID-MATCH-ANY QOF-QUERY-AND)
- (gnc:query-add-date-match-timepair
+ (xaccQueryAddDateMatchTS
query #f end-date-tp #t end-date-tp QOF-QUERY-AND)
;; Get the query result, i.e. all splits in currency
@@ -72,8 +72,8 @@
commodity trans-comm)
(gnc-commodity-equiv
commodity acc-comm)))))
- (gnc:query-get-splits query)))
- (gnc:free-query query)
+ (qof-query-run query)))
+ (qof-query-destroy query)
splits))
;; Returns a sorted list of all splits in the 'currency-accounts' up
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/report/report-system/report-utilities.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -498,21 +498,21 @@
(gnc:group-get-comm-balance-at-date
(gnc:account-get-children account) date)
(gnc:make-commodity-collector)))
- (query (gnc:malloc-query))
+ (query (qof-query-create-for-splits))
(splits #f))
(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)
+ (xaccQueryAddSingleAccountMatch query account QOF-QUERY-AND)
+ (xaccQueryAddDateMatchTS 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)
+ (qof-query-set-sort-increasing query #t #t #t)
+ (qof-query-set-max-results query 1)
- (set! splits (gnc:query-get-splits query))
- (gnc:free-query query)
+ (set! splits (qof-query-run query))
+ (qof-query-destroy query)
(if (and splits (not (null? splits)))
(gnc-commodity-collector-add balance-collector
@@ -652,30 +652,30 @@
;; 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)))
+ (let ((temp-query (qof-query-create-for-splits)))
(qof-query-set-book temp-query book)
- (gnc:query-add-cleared-match
+ (xaccQueryAddClearedMatch
temp-query
CLEARED-VOIDED
QOF-QUERY-AND)
- (set! temp-query (gnc:query-invert temp-query))
+ (set! temp-query (qof-query-invert temp-query))
- (set! query (gnc:query-merge query temp-query QOF-QUERY-AND))))
+ (set! query (qof-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)))
+ (let ((temp-query (qof-query-create-for-splits)))
(qof-query-set-book temp-query book)
- (gnc:query-add-cleared-match
+ (xaccQueryAddClearedMatch
temp-query
CLEARED-VOIDED
QOF-QUERY-AND)
- (set! query (gnc:query-merge query temp-query QOF-QUERY-AND))))
+ (set! query (qof-query-merge query temp-query QOF-QUERY-AND))))
(define (gnc:split-voided? split)
(let ((trans (gnc:split-get-parent split)))
@@ -712,7 +712,7 @@
;; the type is an alist '((str "match me") (cased #f) (regexp #f))
(define (gnc:account-get-trans-type-balance-interval
group type start-date-tp end-date-tp)
- (let* ((query (gnc:malloc-query))
+ (let* ((query (qof-query-create-for-splits))
(splits #f)
(get-val (lambda (alist key)
(let ((lst (assoc-ref alist key)))
@@ -724,15 +724,15 @@
)
(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 QOF-GUID-MATCH-ANY QOF-QUERY-AND)
- (gnc:query-add-date-match-timepair
+ (xaccQueryAddAccountMatch query group QOF-GUID-MATCH-ANY QOF-QUERY-AND)
+ (xaccQueryAddDateMatchTS
query
(and start-date-tp #t) start-date-tp
(and end-date-tp #t) end-date-tp QOF-QUERY-AND)
- (gnc:query-add-description-match
+ (xaccQueryAddDescriptionMatch
query matchstr case-sens regexp QOF-QUERY-AND)
- (set! splits (gnc:query-get-splits query))
+ (set! splits (qof-query-run query))
(map (lambda (split)
(let* ((shares (gnc:split-get-amount split))
(acct-comm (xaccAccountGetCommodity
@@ -743,7 +743,7 @@
)
splits
)
- (gnc:free-query query)
+ (qof-query-destroy query)
total
)
)
@@ -752,8 +752,8 @@
;; *ignores* any closing entries
(define (gnc:account-get-pos-trans-total-interval
group type start-date-tp end-date-tp)
- (let* ((str-query (gnc:malloc-query))
- (sign-query (gnc:malloc-query))
+ (let* ((str-query (qof-query-create-for-splits))
+ (sign-query (qof-query-create-for-splits))
(total-query #f)
(splits #f)
(get-val (lambda (alist key)
@@ -769,28 +769,28 @@
(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 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
+ (xaccQueryAddAccountMatch str-query group QOF-GUID-MATCH-ANY QOF-QUERY-AND)
+ (xaccQueryAddAccountMatch sign-query group QOF-GUID-MATCH-ANY QOF-QUERY-AND)
+ (xaccQueryAddDateMatchTS
str-query
(and start-date-tp #t) start-date-tp
(and end-date-tp #t) end-date-tp QOF-QUERY-AND)
- (gnc:query-add-date-match-timepair
+ (xaccQueryAddDateMatchTS
sign-query
(and start-date-tp #t) start-date-tp
(and end-date-tp #t) end-date-tp QOF-QUERY-AND)
- (gnc:query-add-description-match
+ (xaccQueryAddDescriptionMatch
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 QOF-QUERY-AND)
- (gnc:query-merge
- sign-query (gnc:query-invert str-query) QOF-QUERY-AND)
+ (qof-query-merge sign-query str-query QOF-QUERY-AND)
+ (qof-query-merge
+ sign-query (qof-query-invert str-query) QOF-QUERY-AND)
))
- (set! splits (gnc:query-get-splits total-query))
+ (set! splits (qof-query-run total-query))
(map (lambda (split)
(let* ((shares (gnc:split-get-amount split))
(acct-comm (xaccAccountGetCommodity
@@ -803,7 +803,7 @@
)
splits
)
- (gnc:free-query total-query)
+ (qof-query-destroy total-query)
total
)
)
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/report/standard-reports/average-balance.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -314,7 +314,7 @@
;;(warn commodity-list)
(if (not (null? accounts))
- (let ((query (gnc:malloc-query))
+ (let ((query (qof-query-create-for-splits))
(splits '())
(data '()))
@@ -365,10 +365,10 @@
(delete-duplicates (append accounts subaccts)))))
(gnc:report-percent-done 30)
- (gnc:query-add-account-match query accounts QOF-GUID-MATCH-ANY QOF-QUERY-AND)
+ (xaccQueryAddAccountMatch query accounts QOF-GUID-MATCH-ANY QOF-QUERY-AND)
;; match splits between start and end dates
- (gnc:query-add-date-match-timepair
+ (xaccQueryAddDateMatchTS
query #t begindate #t enddate QOF-QUERY-AND)
(qof-query-set-sort-order query
(list SPLIT-TRANS TRANS-DATE-POSTED)
@@ -376,7 +376,7 @@
'())
;; get the query results
- (set! splits (gnc:query-get-splits query))
+ (set! splits (qof-query-run query))
(gnc:report-percent-done 40)
;; find the net starting balance for the set of accounts
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/report/standard-reports/daily-reports.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -338,7 +338,7 @@
(filter proc (cdr l)))))
(if (not (null? accounts))
- (let* ((query (gnc:malloc-query))
+ (let* ((query (qof-query-create-for-splits))
(splits '())
(data '())
;; startbal will be a commodity-collector
@@ -403,10 +403,10 @@
(delete-duplicates (append accounts subaccts)))))
(gnc:report-percent-done 30)
- (gnc:query-add-account-match query accounts QOF-GUID-MATCH-ANY QOF-QUERY-AND)
+ (xaccQueryAddAccountMatch query accounts QOF-GUID-MATCH-ANY QOF-QUERY-AND)
;; match splits between start and end dates
- (gnc:query-add-date-match-timepair
+ (xaccQueryAddDateMatchTS
query #t from-date-tp #t to-date-tp QOF-QUERY-AND)
(qof-query-set-sort-order query
(list SPLIT-TRANS TRANS-DATE-POSTED)
@@ -414,7 +414,7 @@
'())
;; get the query results
- (set! splits (gnc:query-get-splits query))
+ (set! splits (qof-query-run query))
(gnc:report-percent-done 40)
;; find the net starting balance for the set of accounts
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/report/standard-reports/general-journal.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -48,7 +48,7 @@
(define (general-journal-options-generator)
(let* ((options (gnc:report-template-new-options/name regrptname))
- (query (gnc:malloc-query))
+ (query (qof-query-create-for-splits))
)
(define (set-option! section name value)
@@ -66,9 +66,9 @@
(list SPLIT-TRANS TRANS-DATE-POSTED)
(list QUERY-DEFAULT-SORT)
'())
- (gnc:query-set-sort-increasing query #t #t #t)
+ (qof-query-set-sort-increasing query #t #t #t)
- (gnc:query-add-account-match
+ (xaccQueryAddAccountMatch
query
(gnc:group-get-subaccounts (gnc-book-get-template-group (gnc-get-current-book)))
QOF-GUID-MATCH-NONE
@@ -80,7 +80,7 @@
(set-option! "__reg" (car l) (cadr l)))
;; One list per option here with: option-name, default-value
(list
- (list "query" (gnc:query->scm query)) ;; think this wants an scm...
+ (list "query" (gnc-query2scm query)) ;; think this wants an scm...
(list "journal" #t)
(list "double" #t)
(list "debit-string" (_ "Debit"))
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/report/standard-reports/register.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -559,13 +559,13 @@
(if invoice?
(set! title (_ "Invoice")))
- (set! query (gnc:scm->query query-scm))
+ (set! query (gnc-scm2query query-scm))
(qof-query-set-book query (gnc-get-current-book))
(set! splits (if journal?
- (gnc:query-get-splits-unique-trans query)
- (gnc:query-get-splits query)))
+ (qof-query-run-unique-trans query)
+ (qof-query-run query)))
(set! table (make-split-table splits
(gnc:report-options report-obj)
@@ -602,7 +602,7 @@
(gnc:html-document-set-title! document title)
(gnc:html-document-add-object! document table)
- (gnc:free-query query)
+ (qof-query-destroy query)
document))
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:09:47 UTC (rev 14979)
+++ gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm 2006-10-10 00:10:28 UTC (rev 14980)
@@ -1273,7 +1273,7 @@
(secondary-order (opt-val pagename-sorting "Secondary Sort Order"))
(void-status (opt-val gnc:pagename-accounts optname-void-transactions))
(splits '())
- (query (gnc:malloc-query)))
+ (query (qof-query-create-for-splits)))
;;(gnc:warn "accts in trep-renderer:" c_account_1)
;;(gnc:warn "Report Account names:" (get-other-account-names c_account_1))
@@ -1282,17 +1282,17 @@
(begin
(qof-query-set-book query (gnc-get-current-book))
;;(gnc:warn "query is:" query)
- (gnc:query-add-account-match query
+ (xaccQueryAddAccountMatch query
c_account_1
QOF-GUID-MATCH-ANY QOF-QUERY-AND)
- (gnc:query-add-date-match-timepair
+ (xaccQueryAddDateMatchTS
query #t begindate #t enddate QOF-QUERY-AND)
(qof-query-set-sort-order query
(get-query-sortkey primary-key)
(get-query-sortkey secondary-key)
'())
- (gnc:query-set-sort-increasing query
+ (qof-query-set-sort-increasing query
(eq? primary-order 'ascend)
(eq? secondary-order 'ascend)
#t)
@@ -1304,7 +1304,7 @@
(gnc:query-set-match-voids-only! query (gnc-get-current-book)))
(else #f))
- (set! splits (gnc:query-get-splits query))
+ (set! splits (qof-query-run query))
;;(gnc:warn "Splits in trep-renderer:" splits)
@@ -1364,7 +1364,7 @@
(gnc:html-document-add-object!
document
table)
- (gnc:free-query query))
+ (qof-query-destroy query))
;; error condition: no splits found
(let ((p (gnc:make-html-text)))
(gnc:html-text-append!
More information about the gnucash-changes
mailing list