merge cedric branch

1 files changed, 22 insertions, 50 deletions

diff --git a/src/auditor/taler-auditor-httpd_fee-time-inconsistency-get.c b/src/auditor/taler-auditor-httpd_fee-time-inconsistency-get.c
index e0a368035..e4e679b1f 100644
--- a/src/auditor/taler-auditor-httpd_fee-time-inconsistency-get.c
+++ b/src/auditor/taler-auditor-httpd_fee-time-inconsistency-get.c
@@ -100,57 +100,29 @@ TAH_FEE_TIME_INCONSISTENCY_handler_get (struct TAH_RequestHandler *rh,
   ja = json_array ();
   GNUNET_break (NULL != ja);
 
-    int64_t limit = -20;
-    uint64_t offset;
-
-    TALER_MHD_parse_request_snumber (connection,
-                                     "limit",
-                                     &limit);
-
-    if (limit < 0)
-        offset = INT64_MAX;
-    else
-        offset = 0;
-
-    TALER_MHD_parse_request_number (connection,
-                                    "offset",
-                                    &offset);
-
-    bool return_suppressed = false;
-
-    struct GNUNET_JSON_Specification spec[] = {
-            GNUNET_JSON_spec_bool ("return_suppressed", &return_suppressed),
-            GNUNET_JSON_spec_end ()
-    };
-
-  // read the input json
-  json_t *json_in;
+  int64_t limit = -20;
+  uint64_t offset;
+
+  TALER_MHD_parse_request_snumber (connection,
+                                   "limit",
+                                   &limit);
+
+  if (limit < 0)
+    offset = INT64_MAX;
+  else
+    offset = 0;
+
+  TALER_MHD_parse_request_number (connection,
+                                  "offset",
+                                  &offset);
+
+  bool return_suppressed = false;
+  const char *ret_s = MHD_lookup_connection_value (connection,
+                                                   MHD_GET_ARGUMENT_KIND,
+                                                   "return_suppressed");
+  if (ret_s != NULL && strcmp (ret_s, "true") == 0)
   {
-    enum GNUNET_GenericReturnValue res;
-
-    res = TALER_MHD_parse_post_json (connection,
-                                     connection_cls,
-                                     upload_data,
-                                     upload_data_size,
-                                     &json_in);
-    if (GNUNET_SYSERR == res)
-      return MHD_NO;
-    if ((GNUNET_NO == res) ||
-        (NULL == json_in))
-      return MHD_YES;
-    res = TALER_MHD_parse_json_data (connection,
-                                     json_in,
-                                     spec);
-    if (GNUNET_SYSERR == res)
-    {
-      json_decref (json_in);
-      return MHD_NO;                   /* hard failure */
-    }
-    if (GNUNET_NO == res)
-    {
-      json_decref (json_in);
-      return MHD_YES;                   /* failure */
-    }
+    return_suppressed = true;
   }
 
   qs = TAH_plugin->get_fee_time_inconsistency (