moved yna to exchange

1 files changed, 18 insertions, 57 deletions

diff --git a/src/backend/taler-merchant-httpd_private-get-orders.c b/src/backend/taler-merchant-httpd_private-get-orders.c
index 669a2e3b..d2f502f9 100644
--- a/src/backend/taler-merchant-httpd_private-get-orders.c
+++ b/src/backend/taler-merchant-httpd_private-get-orders.c
@@ -250,12 +250,12 @@ TMH_notify_order_change (const char *instance_id,
        po = pn)
   {
     pn = po->next;
-    if (! ( ( ((TALER_MERCHANTDB_YNA_YES == po->of.paid) == paid) ||
-              (TALER_MERCHANTDB_YNA_ALL == po->of.paid) ) &&
-            ( ((TALER_MERCHANTDB_YNA_YES == po->of.refunded) == refunded) ||
-              (TALER_MERCHANTDB_YNA_ALL == po->of.refunded) ) &&
-            ( ((TALER_MERCHANTDB_YNA_YES == po->of.wired) == wired) ||
-              (TALER_MERCHANTDB_YNA_ALL == po->of.wired) ) ) )
+    if (! ( ( ((TALER_EXCHANGE_YNA_YES == po->of.paid) == paid) ||
+              (TALER_EXCHANGE_YNA_ALL == po->of.paid) ) &&
+            ( ((TALER_EXCHANGE_YNA_YES == po->of.refunded) == refunded) ||
+              (TALER_EXCHANGE_YNA_ALL == po->of.refunded) ) &&
+            ( ((TALER_EXCHANGE_YNA_YES == po->of.wired) == wired) ||
+              (TALER_EXCHANGE_YNA_ALL == po->of.wired) ) ) )
       continue;
     if (0 != strcmp (instance_id,
                      po->instance_id))
@@ -295,48 +295,6 @@ TMH_notify_order_change (const char *instance_id,
 
 
 /**
- * Convert query argument to @a yna value.
- *
- * @param connection connection to take query argument from
- * @param arg argument to try for
- * @param[out] value to set
- * @return true on success, false if the parameter was malformed
- */
-static bool
-arg_to_yna (struct MHD_Connection *connection,
-            const char *arg,
-            enum TALER_MERCHANTDB_YesNoAll *yna)
-{
-  const char *str;
-
-  str = MHD_lookup_connection_value (connection,
-                                     MHD_GET_ARGUMENT_KIND,
-                                     arg);
-  if (NULL == str)
-  {
-    *yna = TALER_MERCHANTDB_YNA_ALL;
-    return true;
-  }
-  if (0 == strcasecmp (str, "yes"))
-  {
-    *yna = TALER_MERCHANTDB_YNA_YES;
-    return true;
-  }
-  if (0 == strcasecmp (str, "no"))
-  {
-    *yna = TALER_MERCHANTDB_YNA_NO;
-    return true;
-  }
-  if (0 == strcasecmp (str, "all"))
-  {
-    *yna = TALER_MERCHANTDB_YNA_ALL;
-    return true;
-  }
-  return false;
-}
-
-
-/**
  * Handle a GET "/orders" request.
  *
  * @param rh context of the handler
@@ -363,23 +321,26 @@ TMH_private_get_orders (const struct TMH_RequestHandler *rh,
                                       "orders", hc->ctx);
   }
 
-  if (! (arg_to_yna (connection,
-                     "paid",
-                     &of.paid)) )
+  if (! (TALER_arg_to_yna (connection,
+                           "paid",
+                           TALER_EXCHANGE_YNA_ALL,
+                           &of.paid)) )
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_PARAMETER_MALFORMED,
                                        "paid");
-  if (! (arg_to_yna (connection,
-                     "refunded",
-                     &of.refunded)) )
+  if (! (TALER_arg_to_yna (connection,
+                           "refunded",
+                           TALER_EXCHANGE_YNA_ALL,
+                           &of.refunded)) )
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_PARAMETER_MALFORMED,
                                        "refunded");
-  if (! (arg_to_yna (connection,
-                     "wired",
-                     &of.wired)) )
+  if (! (TALER_arg_to_yna (connection,
+                           "wired",
+                           TALER_EXCHANGE_YNA_ALL,
+                           &of.wired)) )
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_PARAMETER_MALFORMED,