1 files changed, 37 insertions, 8 deletions

diff --git a/src/zenserver/frontend/html/indexer/worker.js b/src/zenserver/frontend/html/indexer/worker.js
index b8183cc6f..25c8d7671 100644
--- a/src/zenserver/frontend/html/indexer/worker.js
+++ b/src/zenserver/frontend/html/indexer/worker.js
@@ -31,7 +31,7 @@ async function map_id_to_key(project_id, oplog, start, end, page_size, stride)
 			.resource(uri)
 			.param("start", index)
 			.param("count", page_size)
-			.param("fieldfilter", "packagedata,key")
+			.param("fieldfilter", "packagedata,bulkdata,key")
 			.cbo()
 
 		const entry_count = Math.min(page_size, -(index - end));
@@ -66,34 +66,63 @@ async function map_id_to_key(project_id, oplog, start, end, page_size, stride)
 
 			var key = undefined;
 			var pkg_data = undefined;
+			var bulk_data = undefined;
 			for (const field of entry)
 			{
-				if (field.is_named("key")) key = field;
+				if (field.is_named("key"))				key = field;
 				else if (field.is_named("packagedata")) pkg_data = field;
+				else if (field.is_named("bulkdata"))	bulk_data = field;
 			}
 			if (key == undefined || pkg_data == undefined)
 				continue;
 
 			var id = 0n;
-			for (var item of pkg_data.as_array())
+			var size = 0;
+			var raw_size = 0;
+			for (const item of pkg_data.as_array())
 			{
-				var pkg_id = item.as_object().find("id");
-				if (pkg_id == undefined)
+				var found = 0, pkg_id;
+				for (const field of item.as_object())
+				{
+					if (!id && field.is_named("id"))	pkg_id = field.as_value();
+					else if (field.is_named("size"))	size += field.as_value();
+					else if (field.is_named("rawsize"))	raw_size += field.as_value();
+					else continue;
+					if (found++ >= 3)
+						break;
+				}
+
+				if (pkg_id === undefined)
 					continue;
 
-				pkg_id = pkg_id.as_value().subarray(0, 8);
+				pkg_id = pkg_id.subarray(0, 8);
 				for (var i = 7; i >= 0; --i)
 				{
 					id <<= 8n;
 					id  |= BigInt(pkg_id[i]);
 				}
-				break;
+			}
+
+			if (bulk_data)
+			{
+				for (const item of bulk_data.as_array())
+				{
+					var found = 0;
+					for (const field of item.as_object())
+					{
+						if (field.is_named("size"))			size += field.as_value();
+						else if (field.is_named("rawsize"))	raw_size += field.as_value();
+						else continue;
+						if (found++ >= 2)
+							break;
+					}
+				}
 			}
 
 			if (id == 0)
 				continue;
 
-			result[count] = [id, key.as_value()];
+			result[count] = [id, key.as_value(), size, raw_size];
 			count++;
 		}