Bug 738462 Fixes Report Scheme error.

Add missing enum entries for new search types and missing
argument to changed function xaccQueryAddDescriptionMatch.
This commit is contained in:
Robert Fewell 2015-02-21 11:28:29 +00:00 committed by Geert Janssens
parent d4e5bdc354
commit 652f1f5ff7
2 changed files with 4 additions and 2 deletions

View File

@ -296,6 +296,8 @@ KvpValue * kvp_frame_get_slot_path_gslist (KvpFrame *frame, GSList *key_path);
SET_ENUM("QOF-COMPARE-GT");
SET_ENUM("QOF-COMPARE-GTE");
SET_ENUM("QOF-COMPARE-NEQ");
SET_ENUM("QOF-COMPARE-CONTAINS");
SET_ENUM("QOF-COMPARE-NCONTAINS");
SET_ENUM("QOF-NUMERIC-MATCH-ANY");
SET_ENUM("QOF-NUMERIC-MATCH-CREDIT");

View File

@ -859,7 +859,7 @@
(and start-date-tp #t) start-date-tp
(and end-date-tp #t) end-date-tp QOF-QUERY-AND)
(xaccQueryAddDescriptionMatch
str-query matchstr case-sens regexp QOF-QUERY-AND)
str-query matchstr case-sens regexp QOF-COMPARE-CONTAINS QOF-QUERY-AND)
(set! total-query
;; this is a tad inefficient, but its a simple way to accomplish
;; description match inversion...
@ -925,7 +925,7 @@
(begin
(set! query2 (qof-query-create-for-splits))
(if matchstr (xaccQueryAddDescriptionMatch
query2 matchstr case-sens regexp QOF-QUERY-OR))
query2 matchstr case-sens regexp QOF-COMPARE-CONTAINS QOF-QUERY-OR))
(if closing (xaccQueryAddClosingTransMatch query2 1 QOF-QUERY-OR))
(qof-query-merge-in-place query query2 QOF-QUERY-AND)
(qof-query-destroy query2)