[taler-merchant] branch master updated: -change to date_s

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new c25c6711 -change to date_s
c25c6711 is described below

commit c25c6711c6f2df31fea213e6e6f5ac421b8cd6a1
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Fri Jul 8 14:20:42 2022 +0200

    -change to date_s
---
 contrib/merchant-backoffice                           |  2 +-
 src/backend/taler-merchant-httpd_private-get-orders.c | 15 +++++++--------
 src/lib/merchant_api_get_orders.c                     | 13 ++++---------
 src/lib/merchant_api_get_reserves.c                   |  1 -
 src/lib/merchant_api_get_transfers.c                  |  1 -
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 1d7ee55e..182cdfff 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 1d7ee55ea115b91687c203a8f084ea852867b1f0
+Subproject commit 182cdfffa1d4b6f2bb3543d30cfa7509e73bda03
diff --git a/src/backend/taler-merchant-httpd_private-get-orders.c 
b/src/backend/taler-merchant-httpd_private-get-orders.c
index d9059702..c2a17530 100644
--- a/src/backend/taler-merchant-httpd_private-get-orders.c
+++ b/src/backend/taler-merchant-httpd_private-get-orders.c
@@ -686,14 +686,13 @@ TMH_private_get_orders (const struct TMH_RequestHandler 
*rh,
       }
     }
   }
-  // FIXME: use date_s, as we round to seconds anyway!
   {
-    const char *date_ms_str;
+    const char *date_s_str;
 
-    date_ms_str = MHD_lookup_connection_value (connection,
+    date_s_str = MHD_lookup_connection_value (connection,
                                                MHD_GET_ARGUMENT_KIND,
-                                               "date_ms");
-    if (NULL == date_ms_str)
+                                               "date_s");
+    if (NULL == date_s_str)
     {
       if (of.delta > 0)
         of.date = GNUNET_TIME_UNIT_ZERO_TS;
@@ -706,7 +705,7 @@ TMH_private_get_orders (const struct TMH_RequestHandler *rh,
       unsigned long long ll;
 
       if (1 !=
-          sscanf (date_ms_str,
+          sscanf (date_s_str,
                   "%llu%c",
                   &ll,
                   &dummy))
@@ -719,14 +718,14 @@ TMH_private_get_orders (const struct TMH_RequestHandler 
*rh,
       }
 
       of.date = GNUNET_TIME_absolute_to_timestamp (
-        GNUNET_TIME_absolute_from_ms (ll));
+        GNUNET_TIME_absolute_from_s (ll));
       if (GNUNET_TIME_absolute_is_never (of.date.abs_time))
       {
         GNUNET_break_op (0);
         return TALER_MHD_reply_with_error (connection,
                                            MHD_HTTP_BAD_REQUEST,
                                            
TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                           "date_ms");
+                                           "date_s");
       }
     }
   }
diff --git a/src/lib/merchant_api_get_orders.c 
b/src/lib/merchant_api_get_orders.c
index 817c9240..7f08acb6 100644
--- a/src/lib/merchant_api_get_orders.c
+++ b/src/lib/merchant_api_get_orders.c
@@ -273,7 +273,7 @@ TALER_MERCHANT_orders_get2 (
 
   /* build ogh->url with the various optional arguments */
   {
-    char dstr[30];
+    char *dstr;
     bool have_date;
     bool have_srow;
     char cbuf[30];
@@ -292,13 +292,7 @@ TALER_MERCHANT_orders_get2 (
                      sizeof (cbuf),
                      "%llu",
                      (unsigned long long) start_row);
-    // FIXME: use date_s, no need for milliseconds!
-    GNUNET_snprintf (dstr,
-                     sizeof (dstr),
-                     "%llu",
-                     (unsigned long long) (date.abs_time.abs_value_us
-                                           / GNUNET_TIME_UNIT_MILLISECONDS.
-                                           rel_value_us));
+    dstr = GNUNET_strdup (GNUNET_TIME_timestamp2s (date));
     if (delta > 0)
     {
       have_date = ! GNUNET_TIME_absolute_is_zero (date.abs_time);
@@ -323,7 +317,7 @@ TALER_MERCHANT_orders_get2 (
                                (TALER_EXCHANGE_YNA_ALL != wired)
                                ? TALER_yna_to_string (wired)
                                : NULL,
-                               "date_ms",
+                               "date_s",
                                (have_date)
                                ? dstr
                                : NULL,
@@ -340,6 +334,7 @@ TALER_MERCHANT_orders_get2 (
                                ? tbuf
                                : NULL,
                                NULL);
+    GNUNET_free (dstr);
   }
   if (NULL == ogh->url)
   {
diff --git a/src/lib/merchant_api_get_reserves.c 
b/src/lib/merchant_api_get_reserves.c
index 24a527d6..570fc4e5 100644
--- a/src/lib/merchant_api_get_reserves.c
+++ b/src/lib/merchant_api_get_reserves.c
@@ -235,7 +235,6 @@ TALER_MERCHANT_reserves_get (struct GNUNET_CURL_Context 
*ctx,
   rgh->cb_cls = cb_cls;
   active_s = TALER_yna_to_string (active);
   failures_s = TALER_yna_to_string (failures);
-  // FIXME: use different format?
   after_s = GNUNET_strdup (GNUNET_TIME_timestamp2s (after));
   rgh->url = TALER_url_join (backend_url,
                              "private/reserves",
diff --git a/src/lib/merchant_api_get_transfers.c 
b/src/lib/merchant_api_get_transfers.c
index 8938c3d7..275990fc 100644
--- a/src/lib/merchant_api_get_transfers.c
+++ b/src/lib/merchant_api_get_transfers.c
@@ -260,7 +260,6 @@ TALER_MERCHANT_transfers_get (
                    sizeof (offset_s),
                    "%lld",
                    (unsigned long long) offset);
-  // FIXME: use other format?
   before_s = GNUNET_strdup (GNUNET_TIME_timestamp2s (before));
   after_s = GNUNET_strdup (GNUNET_TIME_timestamp2s (after));
   gth->url = TALER_url_join (backend_url,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.