stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed bug while parsing meters with multiple channels

Browse source
This commit is contained in:
Steffen Vogel 2011-10-16 14:32:32 +02:00
parent c5e69ae52f
commit 5215ff8ff0
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/logger/src/configuration.c
View file

@ -159,7 +159,7 @@ assoc_t * parse_meter(struct json_object *jso) {
else if (strcmp(key, "channels") == 0 && check_type(key, value, json_type_array)) {
int len = json_object_array_length(value);
for (int i = 0; i < len; i++) {
list_push(&json_channels, value);
list_push(&json_channels, json_object_array_get_idx(value, i));
}
}
else if (strcmp(key, "channel") == 0 && check_type(key, value, json_type_object)) {
@ -235,11 +235,15 @@ channel_t * parse_channel(struct json_object *jso) {
exit(EXIT_FAILURE);
}
else if (enabled == TRUE) {
// TODO other identifiers are not supported at the moment
reading_id_t id = { (identifier == NULL) ? obis_init(NULL) : obis_parse(identifier) };
char obis_str[10];
obis_unparse(id.obis, obis_str);
channel_t *ch = malloc(sizeof(channel_t));
channel_init(ch, uuid, middleware, id);
print(5, "New channel initialized (uuid=...%s middleware=%s identifier=%s)", ch, uuid+30, middleware, identifier);
print(5, "New channel initialized (uuid=...%s middleware=%s obis=%s)", ch, uuid+30, middleware, obis_str);
return ch;
}