merged plib

[ppastats.git] / src / ppastats.c

diff --git a/src/ppastats.c b/src/ppastats.c
index 7861301..7d67bc4 100644 (file)
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -1,21 +1,21 @@
 /*
-    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-2014 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 <libintl.h>
 #define _(String) gettext(String)
@@ -25,8 +25,8 @@
 #include <string.h>
 
 #include "list.h"
-#include "log.h"
 #include "lp_ws.h"
+#include <plog.h>
 #include "ppastats.h"
 
 static struct package_stats *get_package_stats(struct ppa_stats *stats,
@@ -231,10 +231,11 @@ pkg_add_distro(struct package_stats *pkg,
 struct ppa_stats *
 create_ppa_stats(const char *owner,
                 const char *ppa_name,
-                const char *package_status)
+                const char *package_status,
+                int ws_size)
 {
        struct ppa_stats *ppa;
-       struct binary_package_publishing_history **history, **h_cur, *h;
+       struct bpph **history, **h_cur, *h;
        char *ppa_url, *pkg_name, *pkg_version;
        struct package_stats *pkg;
        struct version_stats *version;
@@ -246,8 +247,7 @@ create_ppa_stats(const char *owner,
        struct daily_download_total **totals;
 
        ppa_url = get_archive_url(owner, ppa_name);
-       history = get_binary_package_publishing_history_list(ppa_url,
-                                                            package_status);
+       history = get_bpph_list(ppa_url, package_status, ws_size);
        free(ppa_url);
 
        if (!history) {
@@ -270,12 +270,7 @@ create_ppa_stats(const char *owner,
                                h->self_link);
                        continue;
                }
-               count = get_download_count(h->self_link);
-               if (count == -1) {
-                       log_err(_("Failed to retrieve download count for %s"),
-                               h->self_link);
-                       count = 0;
-               }
+               count = ddts_get_count(totals);
                pkg_name = h->binary_package_name;
                pkg_version = h->binary_package_version;
                arch_series
@@ -308,7 +303,7 @@ create_ppa_stats(const char *owner,
                daily_download_total_list_free(totals);
        }
 
-       binary_package_publishing_history_list_free(history);
+       bpph_list_free(history);
 
        return ppa;
 }