gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r35372 - in gnunet/src: gns rest


From: gnunet
Subject: [GNUnet-SVN] r35372 - in gnunet/src: gns rest
Date: Wed, 11 Mar 2015 19:02:26 +0100

Author: schanzen
Date: 2015-03-11 19:02:26 +0100 (Wed, 11 Mar 2015)
New Revision: 35372

Modified:
   gnunet/src/gns/plugin_rest_gns.c
   gnunet/src/rest/gnunet-rest-server.c
Log:
-fixes

Modified: gnunet/src/gns/plugin_rest_gns.c
===================================================================
--- gnunet/src/gns/plugin_rest_gns.c    2015-03-11 17:39:32 UTC (rev 35371)
+++ gnunet/src/gns/plugin_rest_gns.c    2015-03-11 18:02:26 UTC (rev 35372)
@@ -220,6 +220,7 @@
   const char *typename;
   char *string_val;
   char *result;
+  const char *exp_str;
   json_t *result_root;
   json_t *result_name;
   json_t *result_array;
@@ -254,6 +255,24 @@
       record_obj = json_object();
       json_object_set_new (record_obj, "type", json_string (typename));
       json_object_set_new (record_obj, "value", json_string (string_val));
+
+      if (GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION & rd[i].flags)
+      {
+        struct GNUNET_TIME_Relative time_rel;
+        time_rel.rel_value_us = rd[i].expiration_time;
+        exp_str = GNUNET_STRINGS_relative_time_to_string (time_rel, 1);
+      }
+      else
+      {
+        struct GNUNET_TIME_Absolute time_abs;
+        time_abs.abs_value_us = rd[i].expiration_time;
+        exp_str = GNUNET_STRINGS_absolute_time_to_string (time_abs);
+      }
+      json_object_set_new (record_obj, "expiration_time", json_string 
(exp_str));
+
+      json_object_set_new (record_obj, "expired",
+                           json_boolean (GNUNET_YES == 
GNUNET_GNSRECORD_is_expired (&(rd[i]))));
+
       json_array_append (result_array, record_obj);
       json_decref (record_obj);
     }
@@ -262,7 +281,7 @@
   json_object_set (result_root, "query_result", result_array);
   json_decref (result_array);
   result = json_dumps (result_root, JSON_COMPACT);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Result %s\n", result);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result %s\n", result);
   json_decref (result_root);
   handle->proc (handle->proc_cls, result, strlen (result), GNUNET_OK);
   GNUNET_free (result);

Modified: gnunet/src/rest/gnunet-rest-server.c
===================================================================
--- gnunet/src/rest/gnunet-rest-server.c        2015-03-11 17:39:32 UTC (rev 
35371)
+++ gnunet/src/rest/gnunet-rest-server.c        2015-03-11 18:02:26 UTC (rev 
35372)
@@ -256,8 +256,6 @@
     }
     return MHD_YES;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Size %d\n", *upload_data_size);
   if (GN_REST_STATE_INIT == con_handle->state)
   {
     if (0 != *upload_data_size)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]