--- a/web/views/xbel.py	Wed Sep 23 19:26:38 2009 +0200
+++ b/web/views/xbel.py	Wed Sep 23 19:40:19 2009 +0200
@@ -22,17 +22,17 @@
     content_type = 'text/xml' #application/xbel+xml
 
     def cell_call(self, row, col):
-        self.wview('xbelitem', self.rset, row=row, col=col)
+        self.wview('xbelitem', self.cw_rset, row=row, col=col)
 
     def call(self):
         """display a list of entities by calling their <item_vid> view"""
         title = self.page_title()
-        url = self.build_url(rql=self.req.form.get('rql', ''))
-        self.w(u'<?xml version="1.0" encoding="%s"?>\n' % self.req.encoding)
+        url = self._cw.build_url(rql=self._cw.form.get('rql', ''))
+        self.w(u'<?xml version="1.0" encoding="%s"?>\n' % self._cw.encoding)
         self.w(u'<!DOCTYPE xbel PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML" "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">')
         self.w(u'<xbel version="1.0">')
-        self.w(u'<title>%s</title>' % self.req._('bookmarks'))
-        for i in xrange(self.rset.rowcount):
+        self.w(u'<title>%s</title>' % self._cw._('bookmarks'))
+        for i in xrange(self.cw_rset.rowcount):
             self.cell_call(i, 0)
         self.w(u"</xbel>")
 
@@ -41,7 +41,7 @@
     __regid__ = 'xbelitem'
 
     def cell_call(self, row, col):
-        entity = self.complete_entity(row, col)
+        entity = self.cw_rset.complete_entity(row, col)
         self.w(u'<bookmark href="%s">' % xml_escape(self.url(entity)))
         self.w(u'  <title>%s</title>' % xml_escape(entity.dc_title()))
         self.w(u'</bookmark>')