projects
/
ppastats.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
filter out duplicated arch-independant packages
[ppastats.git]
/
src
/
lp_json.c
diff --git
a/src/lp_json.c
b/src/lp_json.c
index
1c31ccb
..
2279220
100644
(file)
--- a/
src/lp_json.c
+++ b/
src/lp_json.c
@@
-25,6
+25,7
@@
#include <stdio.h>
#include "lp_json.h"
#include <stdio.h>
#include "lp_json.h"
+#include "lp_ws.h"
struct binary_package_publishing_history *
json_object_to_binary_package_publishing_history(json_object *o)
struct binary_package_publishing_history *
json_object_to_binary_package_publishing_history(json_object *o)
@@
-33,6
+34,7
@@
json_object_to_binary_package_publishing_history(json_object *o)
const char *binary_package_version;
const char *distro_arch_series_link;
const char *self_link;
const char *binary_package_version;
const char *distro_arch_series_link;
const char *self_link;
+ int architecture_specific;
binary_package_name = json_object_get_string
(json_object_object_get(o, "binary_package_name"));
binary_package_name = json_object_get_string
(json_object_object_get(o, "binary_package_name"));
@@
-46,10
+48,17
@@
json_object_to_binary_package_publishing_history(json_object *o)
self_link = json_object_get_string
(json_object_object_get(o, "self_link"));
self_link = json_object_get_string
(json_object_object_get(o, "self_link"));
+ if (json_object_get_boolean
+ (json_object_object_get(o, "architecture_specific")))
+ architecture_specific = 1;
+ else
+ architecture_specific = 0;
+
return binary_package_publishing_history_new(binary_package_name,
binary_package_version,
distro_arch_series_link,
return binary_package_publishing_history_new(binary_package_name,
binary_package_version,
distro_arch_series_link,
- self_link);
+ self_link,
+ architecture_specific);
}
struct distro_arch_series *json_object_to_distro_arch_series(json_object *o)
}
struct distro_arch_series *json_object_to_distro_arch_series(json_object *o)
@@
-113,8
+122,10
@@
struct binary_package_publishing_history * *
json_object_to_binary_package_publishing_history_list(json_object *o)
{
json_object *o_entries;
json_object_to_binary_package_publishing_history_list(json_object *o)
{
json_object *o_entries;
- int i, n;
+ int i, n
, i2
;
struct binary_package_publishing_history **entries;
struct binary_package_publishing_history **entries;
+ struct binary_package_publishing_history *h;
+ const struct distro_arch_series *distro;
o_entries = json_object_object_get(o, "entries");
o_entries = json_object_object_get(o, "entries");
@@
-126,11
+137,24
@@
json_object_to_binary_package_publishing_history_list(json_object *o)
entries = malloc
(sizeof(struct binary_package_publishing_history *)*(n+1));
entries = malloc
(sizeof(struct binary_package_publishing_history *)*(n+1));
- for (i = 0; i < n; i++) {
-
entries[i]
= json_object_to_binary_package_publishing_history
+ for (i = 0
, i2 = 0
; i < n; i++) {
+
h
= json_object_to_binary_package_publishing_history
(json_object_array_get_idx(o_entries, i));
(json_object_array_get_idx(o_entries, i));
+
+ if (!h->architecture_specific) {
+ distro = get_distro_arch_series
+ (h->distro_arch_series_link);
+
+ if (!distro->is_nominated_arch_indep) {
+ binary_package_publishing_history_free(h);
+ continue ;
+ }
+ }
+
+ entries[i2] = h;
+ i2++;
}
}
- entries[
n
] = NULL;
+ entries[
i2
] = NULL;
return entries;
}
return entries;
}