X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Flib%2Fpsensor_json.c;h=ca12fc262dff04216f04ce78d0f35d4f41b5454b;hp=1f3a4790db0c2be997ca878f33c35411c8ff197c;hb=dd9cbee87e002a9954d5f9dd743311cccd4cedef;hpb=d6141b1d4fea0db9b115b06c668be6195ac4e5c6

diff --git a/src/lib/psensor_json.c b/src/lib/psensor_json.c
index 1f3a479..ca12fc2 100644
--- a/src/lib/psensor_json.c
+++ b/src/lib/psensor_json.c
@@ -80,9 +80,11 @@ static json_object *sensor_to_json(struct psensor *s)
 	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->min));
+			       ATT_SENSOR_MIN,
+			       json_object_new_double(s->sess_lowest));
 	json_object_object_add(obj,
-			       ATT_SENSOR_MAX, json_object_new_double(s->max));
+			       ATT_SENSOR_MAX,
+			       json_object_new_double(s->sess_highest));
 	json_object_object_add(obj,
 			       ATT_SENSOR_MEASURES,
 			       measures_to_json_object(s));
@@ -117,14 +119,16 @@ char *sensors_to_json_string(struct psensor **sensors)
 	char *str;
 	json_object *obj = json_object_new_array();
 
-	sensors_cur = sensors;
+	if (sensors) {
+		sensors_cur = sensors;
 
-	while (*sensors_cur) {
-		struct psensor *s = *sensors_cur;
+		while (*sensors_cur) {
+			struct psensor *s = *sensors_cur;
 
-		json_object_array_add(obj, sensor_to_json(s));
+			json_object_array_add(obj, sensor_to_json(s));
 
-		sensors_cur++;
+			sensors_cur++;
+		}
 	}
 
 	str = strdup(json_object_to_json_string(obj));
@@ -155,7 +159,7 @@ struct psensor *psensor_new_from_json(json_object *o,
 			   NULL,
 			   json_object_get_int(otype) | SENSOR_TYPE_REMOTE,
 			   values_max_length);
-	s->url = url;
+	s->provider_data = url;
 
 	free(eid);