IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

glurg must be getting late; fix more mistakes

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8708 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 2003-06-25 05:41:38 +00:00
parent 798e8be70c
commit c30b78e183
7 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/Query.c
View File

@ -370,7 +370,7 @@ xaccQueryAddDateMatchTS (Query * q,
tmp_q = gncQueryCreate ();
if (use_start) {
pred_data = qof_query_date_predicate (QOF_QOF_COMPARE_GTE, QOF_DATE_MATCH_NORMAL, sts);
pred_data = qof_query_date_predicate (QOF_COMPARE_GTE, QOF_DATE_MATCH_NORMAL, sts);
if (!pred_data) {
gncQueryDestroy (tmp_q);
return;
@ -381,7 +381,7 @@ xaccQueryAddDateMatchTS (Query * q,
}
if (use_end) {
pred_data = qof_query_date_predicate (QOF_QOF_COMPARE_LTE, QOF_DATE_MATCH_NORMAL, ets);
pred_data = qof_query_date_predicate (QOF_COMPARE_LTE, QOF_DATE_MATCH_NORMAL, ets);
if (!pred_data) {
gncQueryDestroy (tmp_q);
return;

4
src/engine/QueryCore.h
View File

@ -58,6 +58,10 @@
#define QUERYCORE_DEBCRED QOF_QUERYCORE_DEBCRED
#define QUERYCORE_BOOLEAN QOF_QUERYCORE_BOOLEAN
#define QUERYCORE_NUMERIC QOF_QUERYCORE_NUMERIC
#define QUERYCORE_STRING QOF_QUERYCORE_STRING
#define QUERYCORE_DATE QOF_QUERYCORE_DATE
#define QUERYCORE_INT64 QOF_QUERYCORE_INT64
#define QUERYCORE_DOUBLE QOF_QUERYCORE_DOUBLE
#define QueryAccess QofQueryAccess
#define gncQueryCoreToString qof_query_core_to_string

8
src/engine/QueryNew.c
View File

@ -1555,14 +1555,14 @@ gncQueryPrintStringForHow (QofQueryCompare how)
{
case QOF_COMPARE_LT:
return "QOF_COMPARE_LT";
case QOF_QOF_COMPARE_LTE:
return "QOF_QOF_COMPARE_LTE";
case QOF_COMPARE_LTE:
return "QOF_COMPARE_LTE";
case QOF_COMPARE_EQUAL:
return "QOF_COMPARE_EQUAL";
case QOF_COMPARE_GT:
return "QOF_COMPARE_GT";
case QOF_QOF_COMPARE_GTE:
return "QOF_QOF_COMPARE_GTE";
case QOF_COMPARE_GTE:
return "QOF_COMPARE_GTE";
case QOF_COMPARE_NEQ:
return "QOF_COMPARE_NEQ";
}

8
src/engine/engine-helpers.c
View File

@ -338,9 +338,9 @@ gnc_scm2amt_match_how (SCM how_scm)
char *how = gh_symbol2newstr (how_scm, NULL);
if (!safe_strcmp (how, "amt-match-atleast"))
res = QOF_QOF_COMPARE_GTE;
res = QOF_COMPARE_GTE;
else if (!safe_strcmp (how, "amt-match-atmost"))
res = QOF_QOF_COMPARE_LTE;
res = QOF_COMPARE_LTE;
else if (!safe_strcmp (how, "amt-match-exactly"))
res = QOF_COMPARE_EQUAL;
else {
@ -361,11 +361,11 @@ gnc_scm2kvp_match_how (SCM how_scm)
if (!safe_strcmp (how, "kvp-match-lt"))
res = QOF_COMPARE_LT;
else if (!safe_strcmp (how, "kvp-match-lte"))
res = QOF_QOF_COMPARE_LTE;
res = QOF_COMPARE_LTE;
else if (!safe_strcmp (how, "kvp-match-eq"))
res = QOF_COMPARE_EQUAL;
else if (!safe_strcmp (how, "kvp-match-gte"))
res = QOF_QOF_COMPARE_GTE;
res = QOF_COMPARE_GTE;
else if (!safe_strcmp (how, "kvp-match-gt"))
res = QOF_COMPARE_GT;
else {

4
src/engine/gw-engine-spec.scm
View File

@ -129,10 +129,10 @@
(let ((wt (gw:wrap-enumeration ws '<gnc:query-compare-how> "QofQueryCompare")))
(gw:enum-add-value! wt "QOF_COMPARE_LT" 'query-compare-lt)
(gw:enum-add-value! wt "QOF_QOF_COMPARE_LTE" 'query-compare-lte)
(gw:enum-add-value! wt "QOF_COMPARE_LTE" 'query-compare-lte)
(gw:enum-add-value! wt "QOF_COMPARE_EQUAL" 'query-compare-equal)
(gw:enum-add-value! wt "QOF_COMPARE_GT" 'query-compare-gt)
(gw:enum-add-value! wt "QOF_QOF_COMPARE_GTE" 'query-compare-gte)
(gw:enum-add-value! wt "QOF_COMPARE_GTE" 'query-compare-gte)
(gw:enum-add-value! wt "QOF_COMPARE_NEQ" 'query-compare-neq)
#t)

24
src/engine/qofquerycore.c
View File

@ -299,13 +299,13 @@ static int date_match_predicate (gpointer object, QofQueryAccess get_fcn,
switch (pd->how) {
case QOF_COMPARE_LT:
return (compare < 0);
case QOF_QOF_COMPARE_LTE:
case QOF_COMPARE_LTE:
return (compare <= 0);
case QOF_COMPARE_EQUAL:
return (compare == 0);
case QOF_COMPARE_GT:
return (compare > 0);
case QOF_QOF_COMPARE_GTE:
case QOF_COMPARE_GTE:
return (compare >= 0);
case QOF_COMPARE_NEQ:
return (compare != 0);
@ -418,13 +418,13 @@ static int numeric_match_predicate (gpointer object, QofQueryAccess get_fcn,
switch (pd->how) {
case QOF_COMPARE_LT:
return (compare < 0);
case QOF_QOF_COMPARE_LTE:
case QOF_COMPARE_LTE:
return (compare <= 0);
case QOF_COMPARE_EQUAL:
return compare;
case QOF_COMPARE_GT:
return (compare > 0);
case QOF_QOF_COMPARE_GTE:
case QOF_COMPARE_GTE:
return (compare >= 0);
case QOF_COMPARE_NEQ:
return !compare;
@ -675,13 +675,13 @@ static int int32_match_predicate (gpointer object, QofQueryAccess get_fcn,
switch (pd->how) {
case QOF_COMPARE_LT:
return (val < pdata->val);
case QOF_QOF_COMPARE_LTE:
case QOF_COMPARE_LTE:
return (val <= pdata->val);
case QOF_COMPARE_EQUAL:
return (val == pdata->val);
case QOF_COMPARE_GT:
return (val > pdata->val);
case QOF_QOF_COMPARE_GTE:
case QOF_COMPARE_GTE:
return (val >= pdata->val);
case QOF_COMPARE_NEQ:
return (val != pdata->val);
@ -762,13 +762,13 @@ static int int64_match_predicate (gpointer object, QofQueryAccess get_fcn,
switch (pd->how) {
case QOF_COMPARE_LT:
return (val < pdata->val);
case QOF_QOF_COMPARE_LTE:
case QOF_COMPARE_LTE:
return (val <= pdata->val);
case QOF_COMPARE_EQUAL:
return (val == pdata->val);
case QOF_COMPARE_GT:
return (val > pdata->val);
case QOF_QOF_COMPARE_GTE:
case QOF_COMPARE_GTE:
return (val >= pdata->val);
case QOF_COMPARE_NEQ:
return (val != pdata->val);
@ -849,13 +849,13 @@ static int double_match_predicate (gpointer object, QofQueryAccess get_fcn,
switch (pd->how) {
case QOF_COMPARE_LT:
return (val < pdata->val);
case QOF_QOF_COMPARE_LTE:
case QOF_COMPARE_LTE:
return (val <= pdata->val);
case QOF_COMPARE_EQUAL:
return (val == pdata->val);
case QOF_COMPARE_GT:
return (val > pdata->val);
case QOF_QOF_COMPARE_GTE:
case QOF_COMPARE_GTE:
return (val >= pdata->val);
case QOF_COMPARE_NEQ:
return (val != pdata->val);
@ -1109,11 +1109,11 @@ static int kvp_match_predicate (gpointer object, QofQueryAccess get_fcn,
{
case QOF_COMPARE_LT:
return (compare < 0);
case QOF_QOF_COMPARE_LTE:
case QOF_COMPARE_LTE:
return (compare <= 0);
case QOF_COMPARE_EQUAL:
return (compare == 0);
case QOF_QOF_COMPARE_GTE:
case QOF_COMPARE_GTE:
return (compare >= 0);
case QOF_COMPARE_GT:
return (compare > 0);

4
src/engine/qofquerycore.h
View File

@ -54,10 +54,10 @@ typedef gpointer (*QofQueryAccess)(gpointer);
*/
typedef enum {
QOF_COMPARE_LT = 1,
QOF_QOF_COMPARE_LTE,
QOF_COMPARE_LTE,
QOF_COMPARE_EQUAL,
QOF_COMPARE_GT,
QOF_QOF_COMPARE_GTE,
QOF_COMPARE_GTE,
QOF_COMPARE_NEQ
} QofQueryCompare;