X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_json.c;h=0643a1b3c52eb5454d5587aef6a0491ca3033f4a;hb=f534061fc8230481a3ca40abc1d1e9b79d3c4976;hp=e02ef62f90f3b74b2ca4a947f9c5ac262e488308;hpb=99b65b5be32158ebc793df4ab2b825633e32a100;p=ppastats.git

diff --git a/src/lp_json.c b/src/lp_json.c
index e02ef62..0643a1b 100644
--- a/src/lp_json.c
+++ b/src/lp_json.c
@@ -23,15 +23,9 @@
 #include <string.h>
 #include <time.h>
 
-#include <config.h>
 #include "lp_json.h"
 #include "lp_ws.h"
-
-/* Declares json_bool to have consistent code even with
-   old json lib releases using boolean instead of json_bool.*/
-#ifndef HAVE_JSON_BOOL
-typedef boolean json_bool;
-#endif
+#include <ptime.h>
 
 static time_t json_to_time(json_object *json)
 {
@@ -43,6 +37,8 @@ static time_t json_to_time(json_object *json)
 	if (!str)
 		return -1;
 
+
+	memset(&tm, 0, sizeof(struct tm));
 	tm.tm_isdst = -1;
 	ret = strptime(str, "%FT%T", &tm);
 
@@ -56,7 +52,7 @@ static json_object *time_to_json(time_t t)
 {
 	char *str;
 
-	str = time_to_str(t);
+	str = time_to_str(&t);
 
 	if (str)
 		return json_object_new_string(str);
@@ -259,6 +255,7 @@ json_object_to_daily_download_total(const char *d, json_object *o_c)
 	result = malloc(sizeof(struct daily_download_total));
 	result->count = json_object_get_int(o_c);
 
+	memset(&result->date, 0, sizeof(struct tm));
 	strptime(d, "%FT%T%z", &result->date);
 
 	return result;
@@ -299,3 +296,41 @@ json_object_to_daily_download_totals(json_object *o)
 
 	return result;
 }
+
+struct json_object *date_to_json(struct tm *tm)
+{
+	json_object *json;
+
+	json = json_object_new_array();
+	json_object_array_add(json, json_object_new_int(tm->tm_year+1900));
+	json_object_array_add(json, json_object_new_int(tm->tm_mon+1));
+	json_object_array_add(json, json_object_new_int(tm->tm_mday));
+
+	return json;
+}
+
+json_object *ddts_to_json(struct daily_download_total **ddts)
+{
+	json_object *json_ddt, *json_ddts;
+	struct daily_download_total *ddt;
+
+	json_ddts = json_object_new_array();
+
+	while (ddts && *ddts) {
+		ddt = *ddts;
+
+		json_ddt = json_object_new_object();
+		json_object_object_add(json_ddt,
+				       "value",
+				       json_object_new_int(ddt->count));
+		json_object_object_add(json_ddt,
+				       "time",
+				       date_to_json(&ddt->date));
+
+		json_object_array_add(json_ddts, json_ddt);
+
+		ddts++;
+	}
+
+	return json_ddts;
+}