X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Flib%2Fpsensor_json.c;fp=src%2Flib%2Fpsensor_json.c;h=0000000000000000000000000000000000000000;hp=14e69e0166cc039ca6f8410db4e870966aa68f97;hb=46d058bd1e0f43ea797d19c7e71464e5cf65e902;hpb=02611eef7107eba73945e0ad47edb129c6261cc2

diff --git a/src/lib/psensor_json.c b/src/lib/psensor_json.c
deleted file mode 100644
index 14e69e0..0000000
--- a/src/lib/psensor_json.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2010-2016 jeanfi@gmail.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#include <stdlib.h>
-#include <string.h>
-
-#include <stdio.h>
-
-#include "psensor_json.h"
-#include "url.h"
-
-#define ATT_SENSOR_ID "id"
-#define ATT_SENSOR_NAME "name"
-#define ATT_SENSOR_TYPE "type"
-#define ATT_SENSOR_MIN "min"
-#define ATT_SENSOR_MAX "max"
-#define ATT_SENSOR_LAST_MEASURE "last_measure"
-#define ATT_SENSOR_MEASURES "measures"
-#define ATT_MEASURE_VALUE "value"
-#define ATT_MEASURE_TIME "time"
-
-static json_object *
-measure_to_json_object(struct measure *m)
-{
-	json_object *o = json_object_new_object();
-
-	json_object_object_add(o,
-			       ATT_MEASURE_VALUE,
-			       json_object_new_double(m->value));
-	json_object_object_add(o, ATT_MEASURE_TIME,
-			       json_object_new_int((m->time).tv_sec));
-	return o;
-}
-
-static json_object *
-measures_to_json_object(struct psensor *s)
-{
-	json_object *o;
-	int i;
-
-	o = json_object_new_array();
-
-	for (i = 0; i < s->values_max_length; i++)
-		if (s->measures[i].time.tv_sec)
-			json_object_array_add
-				(o, measure_to_json_object(&s->measures[i]));
-
-
-	return o;
-}
-
-static json_object *sensor_to_json(struct psensor *s)
-{
-	json_object *mo, *obj;
-	struct measure *m;
-
-	obj = json_object_new_object();
-
-	json_object_object_add(obj,
-			       ATT_SENSOR_ID,
-			       json_object_new_string(s->id));
-	json_object_object_add(obj,
-			       ATT_SENSOR_NAME,
-			       json_object_new_string(s->name));
-	json_object_object_add(obj,
-			       ATT_SENSOR_TYPE, json_object_new_int(s->type));
-	json_object_object_add(obj,
-			       ATT_SENSOR_MIN,
-			       json_object_new_double(s->sess_lowest));
-	json_object_object_add(obj,
-			       ATT_SENSOR_MAX,
-			       json_object_new_double(s->sess_highest));
-	json_object_object_add(obj,
-			       ATT_SENSOR_MEASURES,
-			       measures_to_json_object(s));
-
-	m = psensor_get_current_measure(s);
-	mo = json_object_new_object();
-	json_object_object_add(mo,
-			       ATT_MEASURE_VALUE,
-			       json_object_new_double(m->value));
-	json_object_object_add(mo, ATT_MEASURE_TIME,
-			       json_object_new_int((m->time).tv_sec));
-	json_object_object_add(obj, ATT_SENSOR_LAST_MEASURE, mo);
-
-	return obj;
-}
-
-char *sensor_to_json_string(struct psensor *s)
-{
-	char *str;
-	json_object *obj = sensor_to_json(s);
-
-	str = strdup(json_object_to_json_string(obj));
-
-	json_object_put(obj);
-
-	return str;
-}
-
-char *sensors_to_json_string(struct psensor **sensors)
-{
-	struct psensor **sensors_cur;
-	char *str;
-	json_object *obj = json_object_new_array();
-
-	if (sensors) {
-		sensors_cur = sensors;
-
-		while (*sensors_cur) {
-			struct psensor *s = *sensors_cur;
-
-			json_object_array_add(obj, sensor_to_json(s));
-
-			sensors_cur++;
-		}
-	}
-
-	str = strdup(json_object_to_json_string(obj));
-
-	json_object_put(obj);
-
-	return str;
-}
-
-struct psensor *psensor_new_from_json(json_object *o,
-				      const char *sensors_url,
-				      int values_max_length)
-{
-	json_object *oid, *oname, *otype;
-	struct psensor *s;
-	char *eid, *url;
-
-	json_object_object_get_ex(o, "id", &oid);
-	json_object_object_get_ex(o, "name", &oname);
-	json_object_object_get_ex(o, "type", &otype);
-
-	eid = url_encode(json_object_get_string(oid));
-	url = malloc(strlen(sensors_url) + 1 + strlen(eid) + 1);
-	sprintf(url, "%s/%s", sensors_url, eid);
-
-	s = psensor_create(strdup(url),
-			   strdup(json_object_get_string(oname)),
-			   NULL,
-			   json_object_get_int(otype) | SENSOR_TYPE_REMOTE,
-			   values_max_length);
-	s->provider_data = url;
-
-	free(eid);
-
-	return s;
-}
-