github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-05-05 02:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

unbreak XML and CSV output

Browse Source
This commit is contained in:
Jan-Piet Mens
2016-03-07 10:42:57 +01:00
parent 838a303d38
commit 45655b2106
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ocat.c
View File

@@ -349,19 +349,9 @@ int main(int argc, char **argv)
}
json_delete(user_array);
} else if (otype == CSV) {
JsonNode *o = json_mkobject();
json_append_member(o, "locations", user_array);
csv_output(o, CSV, fields, print_xml_line, xmlp);
json_delete(o);
csv_output(user_array, CSV, fields, print_xml_line, xmlp);
} else if (otype == XML) {
JsonNode *o = json_mkobject();
json_append_member(o, "locations", user_array);
xml_output(o, XML, fields, print_xml_line, xmlp);
json_delete(o);
xml_output(user_array, XML, fields, print_xml_line, xmlp);
} else {
fprintf(stderr, "%s: unsupported output type for LAST\n", progname);
}
@@ -483,9 +473,9 @@ int main(int argc, char **argv)
}
} else if (otype == CSV) {
csv_output(obj, CSV, fields, print_xml_line, xmlp);
csv_output(locs, CSV, fields, print_xml_line, xmlp);
} else if (otype == XML) {
xml_output(obj, XML, fields, print_xml_line, xmlp);
xml_output(locs, XML, fields, print_xml_line, xmlp);
} else if (otype == RAW || otype == RAWPAYLOAD) {
/* We've already done what we need to do in locations() */
} else if (otype == LINESTRING) {