From b9bb0d210e752ceeec8d47625650ec368a90545b Mon Sep 17 00:00:00 2001
From: Carl Eberhard <carlfeberhard@gmail.com>
Date: Thu, 29 Jan 2015 13:50:05 -0500
Subject: [PATCH] API, Histories: fix (and simplify) tag filter

---
 lib/galaxy/managers/base.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/galaxy/managers/base.py b/lib/galaxy/managers/base.py
index 3bb50b1b47e..23a3d8eb48b 100644
--- a/lib/galaxy/managers/base.py
+++ b/lib/galaxy/managers/base.py
@@ -938,31 +938,34 @@ class FilterParser( object ):
         return val in owner_annotation
 
     #TODO: to taggable
-    def _filter_tags( self, item, val, fn_name='__eq__' ):
+    def _tag_str_gen( self, item ):
         """
-        Test whether the string version of any tag `fn_name`s (__eq__, contains)
-        `val`.
+        Return a list of strings built from the item's tags.
         """
         #TODO: which user is this? all?
         for tag in item.tags:
             tag_str = tag.user_tname
             if tag.value is not None:
                 tag_str += ":" + tag.user_value
-            if tag_str[ fn_name ]( val ):
-                return True
-        return False
+            yield tag_str
 
     def filter_has_partial_tag( self, item, val ):
         """
         Return True if any tag partially contains `val`.
         """
-        return self._filter_tags( item, val, fn_name='contains' )
+        for tag_str in self._tag_str_gen( item ):
+            if val in tag_str:
+                return True
+        return False
 
     def filter_has_tag( self, item, val ):
         """
         Return True if any tag exactly equals `val`.
         """
-        return self._filter_tags( item, val, fn_name='__eq__' )
+        for tag_str in self._tag_str_gen( item ):
+            if val == tag_str:
+                return True
+        return False
 
     def parse_bool( self, bool_string ):
         """