cosmetic renaming of PR_AMOUNT->PR_VALUE

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6486 57a11ea4-9604-0410-9ed3-97b8803252fd

src/engine/Query.c

@@ -81,7 +81,6 @@ struct _querystruct {
 
 static int  xaccAccountMatchPredicate(Split * s, PredicateData * pd);
 static int  xaccActionMatchPredicate(Split * s, PredicateData * pd);
-static int  xaccAmountMatchPredicate(Split * s, PredicateData * pd);
 static int  xaccBalanceMatchPredicate(Split * s, PredicateData * pd);
 static int  xaccClearedMatchPredicate(Split * s, PredicateData * pd);
 static int  xaccDateMatchPredicate(Split * s, PredicateData * pd);
@@ -92,6 +91,7 @@ static int  xaccMemoMatchPredicate(Split * s, PredicateData * pd);
 static int  xaccNumberMatchPredicate(Split * s, PredicateData * pd);
 static int  xaccSharePriceMatchPredicate(Split * s, PredicateData * pd);
 static int  xaccSharesMatchPredicate(Split * s, PredicateData * pd);
+static int  xaccValueMatchPredicate(Split * s, PredicateData * pd);
 
 /********************************************************************
  ********************************************************************/
@@ -156,12 +156,6 @@ xaccQueryPrint(Query * q)
                   qt->data.str.case_sens);
           printf ("\tmatch string=%s \n", qt->data.str.matchstring);
           break;
-        case PR_AMOUNT:
-          printf ("amount sense=%d how=%d\n", qt->data.amount.sense,
-                  qt->data.amount.how);
-          printf ("\tsign=%d amount=%f\n", qt->data.amount.amt_sgn,
-                  qt->data.amount.amount);
-          break;
         case PR_BALANCE:
           printf ("balance sense=%d how=%d\n", qt->data.balance.sense,
                   qt->data.balance.how);
@@ -245,6 +239,13 @@ xaccQueryPrint(Query * q)
                   qt->data.amount.amount);
           break;
 
+        case PR_VALUE:
+          printf ("value sense=%d how=%d\n", qt->data.amount.sense,
+                  qt->data.amount.how);
+          printf ("\tsign=%d amount=%f\n", qt->data.amount.amt_sgn,
+                  qt->data.amount.amount);
+          break;
+
         default:
           printf ("unkown term type=%d \n", qt->data.base.term_type);
       }
@@ -1533,9 +1534,6 @@ xaccQueryGetPredicate (pr_type_t term_type)
     case PR_ACTION:
       p = & xaccActionMatchPredicate;
       break;
-    case PR_AMOUNT:
-      p = & xaccAmountMatchPredicate;
-      break;
     case PR_BALANCE:
       p = & xaccBalanceMatchPredicate;
       break;
@@ -1566,6 +1564,9 @@ xaccQueryGetPredicate (pr_type_t term_type)
     case PR_SHRS:
       p = & xaccSharesMatchPredicate;
       break;
+    case PR_VALUE:
+      p = & xaccValueMatchPredicate;
+      break;
     case PR_MISC:
       PERR ("misc term must not appear");
       break;
@@ -2011,13 +2012,13 @@ xaccQueryAddActionMatch(Query * q, const char * matchstring, int case_sens,
 
 
 /********************************************************************
- * DxaccQueryAddAmountMatch
+ * DxaccQueryAddValueMatch
  * Add a value filter to an existing query. 
  * FIXME ?? fix what ??
  ********************************************************************/
 
 void
-DxaccQueryAddAmountMatch(Query * q, double amt, 
+DxaccQueryAddValueMatch(Query * q, double amt, 
                          amt_match_sgn_t amt_sgn, 
                          amt_match_t how,
                          QueryOp op) 
@@ -2026,9 +2027,9 @@ DxaccQueryAddAmountMatch(Query * q, double amt,
   QueryTerm * qt  = g_new0(QueryTerm, 1);
   Query     * qr;
 
-  qt->p                     = & xaccAmountMatchPredicate;
+  qt->p                     = & xaccValueMatchPredicate;
   qt->data.type             = PD_AMOUNT;
-  qt->data.base.term_type   = PR_AMOUNT;
+  qt->data.base.term_type   = PR_VALUE;
   qt->data.base.sense       = 1;
   qt->data.amount.how       = how;
   qt->data.amount.amt_sgn   = amt_sgn;
@@ -2647,7 +2648,8 @@ xaccActionMatchPredicate(Split * s, PredicateData * pd)
  *  xaccMemoMatchPredicate 
  *******************************************************************/
 static int
-xaccMemoMatchPredicate(Split * s, PredicateData * pd) {
+xaccMemoMatchPredicate(Split * s, PredicateData * pd) 
+{
   const char  * memo;
   
   g_return_val_if_fail(s && pd, FALSE);
@@ -2658,10 +2660,12 @@ xaccMemoMatchPredicate(Split * s, PredicateData * pd) {
 
 
 /*******************************************************************
- *  xaccAmountMatchPredicate 
+ *  xaccValueMatchPredicate 
  *******************************************************************/
+
 static int
-xaccAmountMatchPredicate(Split * s, PredicateData * pd) {
+xaccValueMatchPredicate(Split * s, PredicateData * pd) 
+{
   double splitamt;
 
   g_return_val_if_fail(s && pd, FALSE);

src/engine/Query.h

@@ -74,7 +74,6 @@ typedef enum {
 typedef enum {
   PR_ACCOUNT=1,
   PR_ACTION,
-  PR_AMOUNT,   /* FIXME: misnamed, should be PR_VALUE */
   PR_BALANCE,
   PR_CLEARED,
   PR_DATE,
@@ -85,7 +84,8 @@ typedef enum {
   PR_MISC,
   PR_NUM,
   PR_PRICE,
-  PR_SHRS   /* FIXME: misnamed, should be PR_AMT */
+  PR_SHRS,   /* FIXME: misnamed, should be PR_QUANT or PR_AMOUNT */
+  PR_VALUE,   
 } pr_type_t;
 
 typedef enum {
@@ -338,7 +338,7 @@ void xaccQueryAddNumberMatch(Query * q, const char * matchstring,
                              int case_sens, int use_regexp, QueryOp op);
 void xaccQueryAddActionMatch(Query * q, const char * matchstring, 
                              int case_sens, int use_regexp, QueryOp op);
-void DxaccQueryAddAmountMatch(Query * q, double amount, 
+void DxaccQueryAddValueMatch(Query * q, double amount, 
                               amt_match_sgn_t amt_sgn,
                               amt_match_t how, QueryOp op);
 void DxaccQueryAddSharePriceMatch(Query * q, double amount, 

src/engine/engine-helpers.c

@@ -969,11 +969,6 @@ gnc_scm2query_term_query (SCM query_term_scm)
 
         switch (pr_type)
         {
-          case PR_AMOUNT:
-            DxaccQueryAddAmountMatch (q, amount, amt_sgn, how, QUERY_OR);
-            ok = TRUE;
-            break;
-
           case PR_PRICE:
             DxaccQueryAddSharePriceMatch (q, amount, how, QUERY_OR);
             ok = TRUE;
@@ -984,6 +979,11 @@ gnc_scm2query_term_query (SCM query_term_scm)
             ok = TRUE;
             break;
 
+          case PR_VALUE:
+            DxaccQueryAddValueMatch (q, amount, amt_sgn, how, QUERY_OR);
+            ok = TRUE;
+            break;
+
           default:
             ok = FALSE;
             break;

src/engine/gw-engine-spec.scm

@@ -469,7 +469,6 @@
                                  "pr_type_t" "const pr_type_t")))
     (gw:enum-add-value! wt "PR_ACCOUNT" 'pr-account)
     (gw:enum-add-value! wt "PR_ACTION" 'pr-action)
-    (gw:enum-add-value! wt "PR_AMOUNT" 'pr-amount)
     (gw:enum-add-value! wt "PR_BALANCE" 'pr-balance)
     (gw:enum-add-value! wt "PR_CLEARED" 'pr-cleared)
     (gw:enum-add-value! wt "PR_DATE" 'pr-date)
@@ -480,6 +479,7 @@
     (gw:enum-add-value! wt "PR_NUM" 'pr-num)
     (gw:enum-add-value! wt "PR_PRICE" 'pr-price)
     (gw:enum-add-value! wt "PR_SHRS" 'pr-shares)
+    (gw:enum-add-value! wt "PR_VALUE" 'pr-value)
     #t)
 
   (let ((wt (gw:wrap-enumeration mod '<gnc:acct-match-how>
@@ -2000,18 +2000,6 @@ of having a parent transaction with which one is working...")
      (<gnc:query-op> how))
    "Match the Action field (a string).")
 
-  (gw:wrap-function
-   mod
-   'd-gnc:query-add-amount-match
-   '<gw:void>
-   "DxaccQueryAddAmountMatch"
-   '((<gnc:Query*> q)
-     (<gw:double> amount)
-     (<gnc:amt-match-sign> sgn)
-     (<gnc:amt-match-how> mhow)
-     (<gnc:query-op> how))
-   "Match the amount (including inequalities)")
-
   (gw:wrap-function
    mod
    'd-gnc:query-add-share-price-match
@@ -2034,6 +2022,18 @@ of having a parent transaction with which one is working...")
      (<gnc:query-op> how))
    "Match the share price (ncluding inequalities)")
 
+  (gw:wrap-function
+   mod
+   'd-gnc:query-add-value-match
+   '<gw:void>
+   "DxaccQueryAddValueMatch"
+   '((<gnc:Query*> q)
+     (<gw:double> value)
+     (<gnc:amt-match-sign> sgn)
+     (<gnc:amt-match-how> mhow)
+     (<gnc:query-op> how))
+   "Match the value (including inequalities)")
+
   (gw:wrap-function
    mod
    'gnc:query-add-date-match

src/engine/test-core/test-engine-stuff.c

@@ -1312,15 +1312,6 @@ get_random_query(void)
         g_free (string);
         break;
 
-      case PR_AMOUNT:
-        DxaccQueryAddAmountMatch
-          (q,
-           get_random_double (),
-           get_random_int_in_range (1, AMT_SGN_MATCH_DEBIT),
-           get_random_int_in_range (1, AMT_MATCH_EXACTLY),
-           get_random_queryop ());
-        break;
-
       case PR_BALANCE:
         xaccQueryAddBalanceMatch
           (q,
@@ -1427,6 +1418,15 @@ get_random_query(void)
            get_random_queryop ());
         break;
 
+      case PR_VALUE:
+        DxaccQueryAddValueMatch
+          (q,
+           get_random_double (),
+           get_random_int_in_range (1, AMT_SGN_MATCH_DEBIT),
+           get_random_int_in_range (1, AMT_MATCH_EXACTLY),
+           get_random_queryop ());
+        break;
+
       case PR_MISC: /* PR_MISC shouldn't be used anyway :) */
       default:
         num_terms++;
@@ -1637,7 +1637,7 @@ make_trans_query (Transaction *trans, TestQueryTypes query_types)
                              TRUE, FALSE, QUERY_AND);
 
     d = gnc_numeric_to_double (xaccSplitGetValue (s));
-    DxaccQueryAddAmountMatch (q, d, AMT_SGN_MATCH_EITHER,
+    DxaccQueryAddValueMatch (q, d, AMT_SGN_MATCH_EITHER,
                               AMT_MATCH_EXACTLY, QUERY_AND);
 
     d = gnc_numeric_to_double (xaccSplitGetAmount (s));