X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_json.c;h=561ca063f7858f37ea303d4b0f91d49d7d9dcb90;hb=5c8cf405dfb5f872f4eb20dcc78bf3df7f175e8d;hp=1c31ccb6c2fe96338d4332878c149bc2c6e73049;hpb=f2b0384f6231324f53e78aa458b9a46b0e659c43;p=ppastats.git

diff --git a/src/lp_json.c b/src/lp_json.c
index 1c31ccb..561ca06 100644
--- a/src/lp_json.c
+++ b/src/lp_json.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-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 <time.h>
@@ -25,6 +25,7 @@
 #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)
@@ -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;
+	int architecture_specific;
 
 	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"));
 
+	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,
-						     self_link);
+						     self_link,
+						     architecture_specific);
 }
 
 struct distro_arch_series *json_object_to_distro_arch_series(json_object *o)
@@ -82,6 +91,7 @@ struct distro_arch_series *json_object_to_distro_arch_series(json_object *o)
 				      is_nominated_arch_indep,
 				      distroseries_link);
 }
+
 struct distro_series *json_object_to_distro_series(json_object *o)
 {
 	const char *displayname;
@@ -107,14 +117,14 @@ 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)
 {
 	json_object *o_entries;
-	int i, n;
+	int i, n, i2;
 	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");
 
@@ -126,11 +136,24 @@ json_object_to_binary_package_publishing_history_list(json_object *o)
 	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));
+
+		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);
+				continue ;
+			}
+		}
+
+		entries[i2] = h;
+		i2++;
 	}
-	entries[n] = NULL;
+	entries[i2] = NULL;
 
 	return entries;
 }
@@ -151,9 +174,13 @@ json_object_to_daily_download_total(const char *d, json_object *o_c)
 static int json_object_get_fields_count(json_object *o)
 {
 	int n = 0;
+	struct lh_entry *entry;
 
-	json_object_object_foreach(o, key, val)
+	entry = json_object_get_object(o)->head;
+	while (entry) {
+		entry = entry->next;
 		n++;
+	}
 
 	return n;
 }