[GNUnet-SVN] [taler-merchant] branch master updated: Fix json formatting.

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new fff2f0e  Fix json formatting.
fff2f0e is described below

commit fff2f0e3c8dc7665cdaa3adeb9d4521e75cb078d
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Feb 22 16:53:39 2017 +0100

    Fix json formatting.
---
 src/backend/taler-merchant-httpd.c          | 4 ++--
 src/backend/taler-merchant-httpd_history.c  | 9 ++++++++-
 src/backend/taler-merchant-httpd_proposal.c | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index b5632b0..ccfb139 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -501,8 +501,8 @@ instances_iterator_cb (void *cls,
                    mi->id);
 
   mi->j_wire = iic->plugin->get_wire_details (iic->plugin->cls,
-                                             iic->config,
-                                             instance_wiresection);
+                                              iic->config,
+                                              instance_wiresection);
   GNUNET_free (instance_wiresection);
 
   if (TALER_EC_NONE !=
diff --git a/src/backend/taler-merchant-httpd_history.c 
b/src/backend/taler-merchant-httpd_history.c
index 4a96d2a..8efd89a 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -51,8 +51,10 @@ history_cb (void *cls,
   json_t *response = cls;
   json_t *entry;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "history_cb\n");
   GNUNET_break (NULL !=
-               (entry = json_pack ("{s:o, s:s, s:s, s:o}",
+               (entry = json_pack ("{s:o, s:s, s:o, s:o}",
                                    "h_proposal_data", 
GNUNET_JSON_from_data_auto (h_proposal_data),
                                    "exchange", exchange_uri,
                                    "timestamp", GNUNET_JSON_from_time_abs 
(timestamp),
@@ -105,6 +107,11 @@ MH_handler_history (struct TMH_RequestHandler *rh,
     return TMH_RESPONSE_reply_bad_request (connection,
                                           TALER_EC_HISTORY_TIMESTAMP_OVERFLOW,
                                            "Timestamp overflowed");
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Querying history back to %llu\n",
+              date.abs_value_us);
+
   ret = db->find_transactions_by_date (db->cls,
                                        date,
                                        history_cb,
diff --git a/src/backend/taler-merchant-httpd_proposal.c 
b/src/backend/taler-merchant-httpd_proposal.c
index 51ea038..c0dca1b 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -339,8 +339,8 @@ MH_handler_proposal_put (struct TMH_RequestHandler *rh,
   if (NULL == order)
   {
     res = TMH_RESPONSE_reply_arg_missing (connection,
-                                          TALER_EC_PARAMETER_MISSING,
-                                          "order");
+                                          TALER_EC_PARAMETER_MISSING,
+                                         "order");
   }
   else
   {

-- 
To stop receiving notification emails like this one, please contact
address@hidden