X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_json.c;h=a2b88f6a25cdc68cadf78ef5e0c57a474e9b05bc;hb=60892f2ef45fa1ee656e1a00cac0578f9d6f9536;hp=bb876f84832af4bab320cd8b892fc7f73e30733f;hpb=9d8ca122223ad917f61d4f8f5e32f809b5926222;p=ppastats.git diff --git a/src/lp_json.c b/src/lp_json.c index bb876f8..a2b88f6 100644 --- a/src/lp_json.c +++ b/src/lp_json.c @@ -1,40 +1,42 @@ /* - Copyright (C) 2011 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 -*/ + * Copyright (C) 2011-2012 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 + */ #define _XOPEN_SOURCE #include - #include #include +#include +#include #include "lp_json.h" #include "lp_ws.h" -struct binary_package_publishing_history * -json_object_to_binary_package_publishing_history(json_object *o) +static struct bpph *json_to_bpph(json_object *o) { const char *binary_package_name; const char *binary_package_version; const char *distro_arch_series_link; const char *self_link; int architecture_specific; + const char *date_created; + struct bpph *bpph; binary_package_name = json_object_get_string (json_object_object_get(o, "binary_package_name")); @@ -54,11 +56,63 @@ json_object_to_binary_package_publishing_history(json_object *o) else architecture_specific = 0; - return binary_package_publishing_history_new(binary_package_name, - binary_package_version, - distro_arch_series_link, - self_link, - architecture_specific); + bpph = bpph_new(binary_package_name, + binary_package_version, + distro_arch_series_link, + self_link, + architecture_specific); + + date_created = json_object_get_string + (json_object_object_get(o, "date_created")); + if (date_created) { + bpph->date_created.tm_isdst = -1; + strptime(date_created, "%FT%T%z", &bpph->date_created); + } + + return bpph; +} + +static json_object *bpph_to_json(struct bpph *bpph) +{ + json_object *json; + char *date; + + json = json_object_new_object(); + + json_object_object_add + (json, + "binary_package_name", + json_object_new_string(bpph->binary_package_name)); + + json_object_object_add + (json, + "binary_package_version", + json_object_new_string(bpph->binary_package_version)); + + json_object_object_add + (json, + "distro_arch_series_link", + json_object_new_string(bpph->distro_arch_series_link)); + + json_object_object_add + (json, + "architecture_specific", + json_object_new_boolean(bpph->architecture_specific)); + + date = malloc(strlen("YY-MM-DDThh:mm:ss+xxx") + 1); + strftime(date, + strlen("YY-MM-DDThh:mm:ss+xxx") + 1, + "%FT%T%z", + &bpph->date_created); + + json_object_object_add + (json, + "date_created", + json_object_new_string(date)); + + free(date); + + return json; } struct distro_arch_series *json_object_to_distro_arch_series(json_object *o) @@ -69,7 +123,6 @@ struct distro_arch_series *json_object_to_distro_arch_series(json_object *o) boolean is_nominated_arch_indep; const char *distroseries_link; - display_name = json_object_get_string (json_object_object_get(o, "display_name")); @@ -117,13 +170,11 @@ struct distro_series *json_object_to_distro_series(json_object *o) displayname); } -struct binary_package_publishing_history * * -json_object_to_binary_package_publishing_history_list(json_object *o) +struct bpph **json_object_to_bpph_list(json_object *o) { json_object *o_entries; int i, n, i2; - struct binary_package_publishing_history **entries; - struct binary_package_publishing_history *h; + struct bpph **entries, *h; const struct distro_arch_series *distro; o_entries = json_object_object_get(o, "entries"); @@ -134,18 +185,18 @@ json_object_to_binary_package_publishing_history_list(json_object *o) n = json_object_array_length(o_entries); entries = malloc - (sizeof(struct binary_package_publishing_history *)*(n+1)); + (sizeof(struct bpph *)*(n+1)); for (i = 0, i2 = 0; i < n; i++) { - h = json_object_to_binary_package_publishing_history - (json_object_array_get_idx(o_entries, i)); + h = json_to_bpph(json_object_array_get_idx(o_entries, + i)); if (!h->architecture_specific) { distro = get_distro_arch_series (h->distro_arch_series_link); if (!distro || !distro->is_nominated_arch_indep) { - binary_package_publishing_history_free(h); + bpph_free(h); continue ; } } @@ -158,6 +209,22 @@ json_object_to_binary_package_publishing_history_list(json_object *o) return entries; } +json_object *bpph_list_to_json(struct bpph **list) +{ + json_object *result, *entries; + struct bpph **cur; + + result = json_object_new_object(); + + entries = json_object_new_array(); + json_object_object_add(result, "entries", entries); + + for (cur = list; *cur; cur++) + json_object_array_add(entries, bpph_to_json(*cur)); + + return result; +} + struct daily_download_total * json_object_to_daily_download_total(const char *d, json_object *o_c) {