Fix version output when missing.

[plcapi.git] / PLC / TagTypes.py

diff --git a/PLC/TagTypes.py b/PLC/TagTypes.py
index 7a4df1f..d4d4cd7 100644 (file)
--- a/PLC/TagTypes.py
+++ b/PLC/TagTypes.py
@@ -1,9 +1,9 @@
-# $Id#
+# $Id$
+# $Id$
+# $URL$
 #
 # Thierry Parmentelat - INRIA
 #
-# $Revision: 9423 $
-#
 from types import StringTypes
 
 from PLC.Faults import *
@@ -22,7 +22,7 @@ class TagType (Row):
 
     table_name = 'tag_types'
     primary_key = 'tag_type_id'
-    join_tables = ['node_tag', 'interface_setting', 'slice_attribute' ]
+    join_tables = ['node_tag', 'interface_tag', 'slice_tag', 'site_tag', 'person_tag' ]
     fields = {
         'tag_type_id': Parameter(int, "Node tag type identifier"),
         'tagname': Parameter(str, "Node tag type name", max = 100),
@@ -33,13 +33,13 @@ class TagType (Row):
 
     def validate_name(self, name):
         if not len(name):
-            raise PLCInvalidArgument, "node tag type name must be set"
+            raise PLCInvalidArgument, "tag type name must be set"
 
         conflicts = TagTypes(self.api, [name])
         for tag_type in conflicts:
             if 'tag_type_id' not in self or \
                    self['tag_type_id'] != tag_type['tag_type_id']:
-                raise PLCInvalidArgument, "node tag type name already in use"
+                raise PLCInvalidArgument, "tag type name already in use"
 
         return name
 
@@ -72,10 +72,13 @@ class TagTypes(Table):
             elif isinstance(tag_type_filter, dict):
                 tag_type_filter = Filter(TagType.fields, tag_type_filter)
                 sql += " AND (%s) %s" % tag_type_filter.sql(api, "AND")
-            elif isinstance (tag_type_filter, StringTypes):
-                tag_type_filter = Filter(TagType.fields, {'tagname':[tag_type_filter]})
+            elif isinstance(tag_type_filter, (int, long)):
+                tag_type_filter = Filter(TagType.fields, {'tag_type_id':tag_type_filter})
+                sql += " AND (%s) %s" % tag_type_filter.sql(api, "AND")
+            elif isinstance(tag_type_filter, StringTypes):
+                tag_type_filter = Filter(TagType.fields, {'tagname':tag_type_filter})
                 sql += " AND (%s) %s" % tag_type_filter.sql(api, "AND")
             else:
-                raise PLCInvalidArgument, "Wrong node tag type filter %r"%tag_type_filter
+                raise PLCInvalidArgument, "Wrong tag type filter %r"%tag_type_filter
 
         self.selectall(sql)