Changeset 9508 for trunk/src/common/logger.py

Timestamp:

04/21/08 00:58:47 (7 months ago)

Author:

asterix

Message:

new XEP-0115 implementation (version 1.5)

Files:

• trunk/src/common/logger.py (modified) (3 diffs)

trunk/src/common/logger.py

@@ -699 +699 @@
                 #tmp, self.con.text_factory = self.con.text_factory, str
                 try:
-                        self.cur.execute('''SELECT node, ver, ext, data FROM caps_cache;''');
+                        self.cur.execute('SELECT hash_method, hash, data FROM caps_cache;');
                 except sqlite.OperationalError:
                         # might happen when there's no caps_cache table yet
@@ -706 +706 @@
                         return
                 #self.con.text_factory = tmp
-
-                for node, ver, ext, data in self.cur:
+                for hash_method, hash, data in self.cur:
                         # for each row: unpack the data field
                         # (format: (category, type, name, category, type, name, ...
                         #   ..., 'FEAT', feature1, feature2, ...).join(' '))
                         # NOTE: if there's a need to do more gzip, put that to a function
-                        data=GzipFile(fileobj=StringIO(str(data))).read().split('\0')
+                        data = GzipFile(fileobj=StringIO(str(data))).read().split('\0')
                         i=0
-                        identities=set()
-                        features=set()
-                        while i<(len(data)-2) and data[i]!='FEAT':
-                                category=data[i]
-                                type=data[i+1]
-                                name=data[i+2]
-                                identities.add((category,type,name))
-                                i+=3
+                        identities = list()
+                        features = list()
+                        while i < (len(data) - 3) and data[i] != 'FEAT':
+                                category = data[i]
+                                type_ = data[i + 1]
+                                lang = data[i + 2]
+                                name = data[i + 3]
+                                identities.append({'category': category, 'type': type_,
+                                        'xml:lang': lang, 'name': name})
+                                i += 4
                         i+=1
-                        while i<len(data):
-                                features.add(data[i])
-                                i+=1
-                        if not ext: ext=None    # to make '' a None
+                        while i < len(data):
+                                features.append(data[i])
+                                i += 1
 
                         # yield the row
-                        yield node, ver, ext, identities, features
-
-        def add_caps_entry(self, node, ver, ext, identities, features):
+                        yield hash_method, hash, identities, features
+
+        def add_caps_entry(self, hash_method, hash, identities, features):
                 data=[]
                 for identity in identities:
                         # there is no FEAT category
-                        if identity[0]=='FEAT': return
-                        if len(identity)<2 or not identity[2]:
-                                data.extend((identity[0], identity[1], ''))
-                        else:
-                                data.extend(identity)
+                        if identity['category'] == 'FEAT':
+                                return
+                        data.extend((identity.get('category'), identity.get('type', ''),
+                                identity.get('xml:lang', ''), identity.get('name', '')))
                 data.append('FEAT')
                 data.extend(features)
@@ -745 +744 @@
                 # if there's a need to do more gzip, put that to a function
                 string = StringIO()
-                gzip=GzipFile(fileobj=string, mode='w')
+                gzip = GzipFile(fileobj=string, mode='w')
                 gzip.write(data)
                 gzip.close()
                 data = string.getvalue()
                 self.cur.execute('''
-                        INSERT INTO caps_cache ( node, ver, ext, data )
-                        VALUES (?, ?, ?, ?);
-                        ''', (node, ver, ext, buffer(data))) # (1) -- note above
+                        INSERT INTO caps_cache ( hash_method, hash, data )
+                        VALUES (?, ?, ?);
+                        ''', (hash_method, hash, buffer(data))) # (1) -- note above
                 try:
                         self.con.commit()