X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp.c;h=79fcce6d4a6f594ceada5d2f3c981da449f5b711;hb=12cf1b3a4702e58c5797be638ab48e899ef932a4;hp=f3d06102713ce799cff198bb81b3d3a8f9605949;hpb=f5fbf6bcfcac7e2b6df90e00f618c642539d013d;p=ppastats.git diff --git a/src/lp.c b/src/lp.c index f3d0610..79fcce6 100644 --- a/src/lp.c +++ b/src/lp.c @@ -1,29 +1,50 @@ /* - 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 + */ #include #include #include +#include "list.h" #include "lp.h" +char *time_to_str(time_t t) +{ + char *str; + struct tm *tm; + size_t ret; + + tm = localtime(&t); + + if (!tm) + return NULL; + + str = malloc(strlen("YYYY-MM-DDThh:mm:ss") + 1); + ret = strftime(str, strlen("YYYY-MM-DDThh:mm:ss") + 1, "%FT%T", tm); + + if (ret) + return str; + + free(str); + return NULL; +} + struct distro_series *distro_series_new(const char *name, const char *version, const char *title, @@ -53,47 +74,47 @@ void distro_series_free(struct distro_series *d) } } -void -binary_package_publishing_history_free \ -(struct binary_package_publishing_history *b) +void bpph_free(struct bpph *b) { if (b) { free(b->binary_package_name); free(b->binary_package_version); free(b->distro_arch_series_link); free(b->self_link); + free(b->status); free(b); } } -struct binary_package_publishing_history * -binary_package_publishing_history_new(const char *binary_package_name, - const char *binary_package_version, - const char *distro_arch_series_link, - const char *self_link, - int architecture_specific) +struct bpph *bpph_new(const char *binary_package_name, + const char *binary_package_version, + const char *distro_arch_series_link, + const char *self_link, + const char *status, + int architecture_specific, + time_t date_created) { - struct binary_package_publishing_history *b; + struct bpph *h; - b = malloc(sizeof(struct binary_package_publishing_history)); + h = malloc(sizeof(struct bpph)); - b->binary_package_name = strdup(binary_package_name); - b->binary_package_version = strdup(binary_package_version); - b->distro_arch_series_link = strdup(distro_arch_series_link); - b->self_link = strdup(self_link); - b->architecture_specific = architecture_specific; + h->binary_package_name = strdup(binary_package_name); + h->binary_package_version = strdup(binary_package_version); + h->distro_arch_series_link = strdup(distro_arch_series_link); + h->self_link = strdup(self_link); + h->architecture_specific = architecture_specific; + h->status = strdup(status); + h->date_created = date_created; - return b; + return h; } -void -binary_package_publishing_history_list_free\ -(struct binary_package_publishing_history **list) +void bpph_list_free(struct bpph **list) { - struct binary_package_publishing_history **l_cur = list; + struct bpph **l_cur = list; while (*l_cur) { - binary_package_publishing_history_free(*l_cur); + bpph_free(*l_cur); l_cur++; } @@ -172,3 +193,30 @@ void daily_download_total_list_free(struct daily_download_total **list) } } +struct bpph **bpph_list_add(struct bpph **list, struct bpph *new) +{ + struct bpph **cur, *bpph; + + if (list) + for (cur = list; *cur; cur++) { + bpph = *cur; + + if (!strcmp(bpph->self_link, new->self_link)) + return list; + } + + return (struct bpph **)list_add((void **)list, new); +} + +struct bpph **bpph_list_append_list(struct bpph **list1, struct bpph **list2) +{ + struct bpph **cur; + + if (!list2) + return list1; + + for (cur = list2; *cur; cur++) + list1 = bpph_list_add(list1, *cur); + + return list1; +}