From e7501fc0cfcab279a2bed17f64755cae2b0c601f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Wed, 18 Mar 2015 16:24:05 +0100
Subject: [PATCH] Server now indexes tags (Types) of all event Nodes, not just
first one
---
warden3/warden_server/warden_server.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py
index 5c94c6a..24cafc3 100755
--- a/warden3/warden_server/warden_server.py
+++ b/warden3/warden_server/warden_server.py
@@ -633,12 +633,11 @@ class MySQL(ObjectReq):
cat_id = self.catmap.get(cat, self.catmap_other)
self.query("INSERT INTO event_category_mapping (event_id,category_id) VALUES (%s, %s)", (lastid, cat_id), dml=True)
- try:
- tags = event['Node'][0]['Tags']
- except (KeyError, IndexError):
- tags = []
-
- for tag in tags:
+ nodes = event.get('Node', [])
+ tags = []
+ for node in nodes:
+ tags.extend(node.get('Type', []))
+ for tag in set(tags):
tag_id = self.tagmap.get(tag, self.tagmap_other)
self.query("INSERT INTO event_tag_mapping (event_id,tag_id) VALUES (%s, %s)", (lastid, tag_id), dml=True)
--
GitLab