Changeset 695

Timestamp:

06/18/08 15:53:23 (5 months ago)

Author:

sylvain

Message:

Starting support for tag based on pubsub nodes and atom indexes

Files:

• oss/headstock/headstock/example/microblog/microblog/jabber/pubsub.py (modified) (3 diffs)
• oss/headstock/headstock/example/microblog/microblog/web/application.py (modified) (3 diffs)
• oss/headstock/headstock/example/microblog/microblog/web/atompub.py (modified) (2 diffs)

oss/headstock/headstock/example/microblog/microblog/jabber/pubsub.py

@@ -298 +298 @@
-        return 1
-
-
+, node
-        uuid = generate_uuid_uri()
-        entry = E.load('./entry.atom').xml_root
@@ -307 +307 @@
-        entry.get_child('updated', ns=entry.xml_ns).xml_text = dt
-        entry.get_child('content', ns=entry.xml_ns).xml_text = unicode(msg)
+
+        if node != self.pubsub_top_level_node:
+            tag = extract_url_trail(node)
+            E(u'category', namespace=entry.xml_ns, prefix=entry.xml_prefix,
+              attributes={u'term': unicode(tag)}, parent=entry)
+        
+        print entry.xml()
-        return uuid, entry
-        
@@ -330 +337 @@
-                if m:
-                    node, message = m.groups()
-
+, node
-                i = Item(id=uuid, payload=entry)
-                p = Node(unicode(self.from_jid), u'pubsub.%s' % self.xmpphost,

oss/headstock/headstock/example/microblog/microblog/web/application.py

@@ -6 +6 @@
-from microblog.profile.user import EmptyUserProfile, UserProfile
-from microblog.web.speakup import SpeakUpWebApplication
-
+
+
-
-__all__ = ['WebApplication']
@@ -87 +88 @@
-    def attach_serving_collection_application(self, c, profile, d):
-        profile_name = profile.username
+        route = '/%s' % profile_name.encode('utf-8')
+
+        controller = CollectionPagingHandler(c)
+        d.add('%s/paging' % route, GET=controller.GET)
+
+        controller = CollectionTagingHandler(c)
+        d.add('%s/tag/{tag}' % route, GET=controller.index)
+
-        controller = CollectionHandler(c)
-        route = '/%s' % profile_name.encode('utf-8')
-        speakup = SpeakUpWebApplication(self.base_dir, self.atompub, 
-                                        self.tpl_lookup, profile, controller)
-
-        d.add('%s[/]' % route, GET=speakup.index,
-              POST=controller.create)
@@ -98 +105 @@
-              PUT=controller.replace,
-              DELETE=controller.remove)
-
-        controller = CollectionPagingHandler(c)
-        d.add('%s/paging' % route, GET=controller.GET)

oss/headstock/headstock/example/microblog/microblog/web/atompub.py

@@ -22 +22 @@
-
-__all__ = ['AtomPubWebApplication', 'CollectionHandler',
-
+, 'CollectionTagingHandler'
-
-class AtomPubWebApplication(object):
@@ -238 +238 @@
-        cherrypy.response.headers['content-type'] = 'application/atom+xml;type=feed'
-        return feed.xml(indent=True)
+
+class CollectionTagingHandler(object):
+    def __init__(self, collection):
+        self.collection = collection
+        self.cat_index = self.collection.indexers[0].retrieve('ci')
+
+    def index(self, tag):
+        res = self.cat_index.lookup(term=tag)
+        if res:
+            member_ids = [member_id for collection, member_id in res]
+            members = self.collection.reload_members_from_list(member_ids)
+            feed = self.collection.to_feed(members=members)
+            cherrypy.response.headers['etag'] = compute_etag_from_feed(feed)
+            cherrypy.response.headers['content-type'] = 'application/atom+xml;type=feed'
+            return feed.xml(indent=True)
+
+        return "No results"