Changeset 8643 for branches/gajim_0.11.1/src/common

Timestamp:

08/30/07 23:05:00 (15 months ago)

Author:

roidelapluie

Message:

0.11.2: add multiple data form support (XEP-0004)

Files:

• branches/gajim_0.11.1/src/common/dataforms.py (modified) (4 diffs)

branches/gajim_0.11.1/src/common/dataforms.py

@@ -64 +64 @@
                 'list-single': ListSingleField,
                 'text-multi': TextMultiField,
-        }[typ](extend=node)
-        return f
+        }
+        if typ not in f:
+                typ = 'text-single'
+        return f[typ](extend=node)
 
 def ExtendForm(node):
         ''' Helper function to extend a node to form of appropriate type. '''
-        if node.getTag('recorded') is not None:
+        if node.getTag('reported') is not None:
                 return MultipleDataForm(extend=node)
         else:
@@ -386 +388 @@
 
 class MultipleDataForm(DataForm):
-        def __init__(self):
+        def __init__(self, type=None, title=None, instructions=None, items=None, extend=None):
+                DataForm.__init__(self, type=type, title=title, instructions=instructions, extend=extend)
                 # all records, recorded into DataRecords
-                pass
+                if extend is None:
+                        # we have to build this object from scratch
+                        xmpp.Node.__init__(self)
+
+                        if items is not None: self.items = items
+                else:
+                        # we already have xmpp.Node inside - try to convert all
+                        # fields into DataField objects
+                        if items is None:
+                                self.items = list(self.iterTags('item'))
+                        else:
+                                for item in self.getTags('item'):
+                                        self.delChild(item)
+                                self.items = items
+                reported_tag = self.getTag('reported')
+                self.reported = DataRecord(extend = reported_tag)
 
         @nested_property
@@ -402 +420 @@
                                 self.addChild(node=record)
                 def fdel(self):
-                        for record in self.getTags('record'):
+                        for record in self.getTags('item'):
                                 self.delChild(record)
                 return locals()
@@ -410 +428 @@
                         yield record
 
-        @nested_property
-        def recorded():
-                ''' DataRecord that contains descriptions of fields in records.'''
-                def fget(self):
-                        return self.getTag('recorded')
-                def fset(self, record):
-                        try:
-                                self.delChild('recorded')
-                        except:
-                                pass
-
-                        record.setName('recorded')
-                        self.addChild(node=record)
-                return locals()
-
+#       @nested_property
+#       def reported():
+#               ''' DataRecord that contains descriptions of fields in records.'''
+#               def fget(self):
+#                       return self.getTag('reported')
+#               def fset(self, record):
+#                       try:
+#                               self.delChild('reported')
+#                       except:
+#                               pass
+#
+#                       record.setName('reported')
+#                       self.addChild(node=record)
+#               return locals()
+