(no commit message)

[ppastats.git] / src / lp_ws.c

diff --git a/src/lp_ws.c b/src/lp_ws.c
index 09e9ede..4b51be8 100644 (file)
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -24,6 +24,7 @@
 #include <json/json.h>
 
 #include "cache.h"
+#include "list.h"
 #include "lp_ws.h"
 #include "lp_json.h"
 #include "ppastats.h"
@@ -115,38 +116,51 @@ static json_object *get_json_object(const char *url)
        return NULL;
 }
 
+#define json_object_to_bpph_list \
+json_object_to_binary_package_publishing_history_list
+
 struct binary_package_publishing_history * *
 get_binary_package_publishing_history_list(const char *archive_url,
-                                          const char *package_status)
+                                          const char *pkg_status)
 {
-       char *url = malloc(strlen(archive_url)+
-                          strlen(QUERY_GET_PUBLISHED_BINARIES)+
-                          strlen("&status=")+
-                          9+
-                          1);
+       struct json_object *o_next;
+       char *url;
        json_object *o;
-       struct binary_package_publishing_history **result;
+       void **result = NULL;
+
+       url = malloc(strlen(archive_url)+
+                    strlen(QUERY_GET_PUBLISHED_BINARIES)+
+                    (pkg_status ? strlen("&status=")+strlen(pkg_status) : 0)+
+                    1);
 
        strcpy(url, archive_url);
        strcat(url, QUERY_GET_PUBLISHED_BINARIES);
 
-
-       if (package_status) {
+       if (pkg_status) {
                strcat(url, "&status=");
-               strcat(url, package_status);
+               strcat(url, pkg_status);
        }
 
-       o = get_json_object(url);
-       free(url);
+       while (url) {
+               o = get_json_object(url);
+               free(url);
+               url = NULL;
 
-       if (!o)
-               return NULL;
+               if (!o)
+                       break;
 
-       result = json_object_to_binary_package_publishing_history_list(o);
+               result = list_append_list(result,
+                                         (void **)json_object_to_bpph_list(o));
 
-       json_object_put(o);
+               o_next = json_object_object_get(o, "next_collection_link");
 
-       return result;
+               if (o_next)
+                       url = strdup(json_object_get_string(o_next));
+
+               json_object_put(o);
+       }
+
+       return (struct binary_package_publishing_history **)result;
 }
 
 int get_download_count(const char *archive_url)