a few bug fixes and make the tests pass again

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@1342 fd906abe-77d9-0310-91a1-e0d9ade77398

browser/resource.py

@@ -88,8 +88,9 @@ class ResourceView(BaseView):
     def __init__(self, context, request):
         super(ResourceView, self).__init__(context, request)
         if not IUnauthenticatedPrincipal.providedBy(self.request.principal):
-            cm = self.controller.macros
-            cm.register('portlet_right', 'related', title='Related Items',
+            cont = self.controller
+            if cont is not None:
+                cont.macros.register('portlet_right', 'related', title='Related Items',
                              subMacro=self.template.macros['related'],
                              position=0, info=self)
 

helpers.txt

@@ -353,9 +353,13 @@ Now we are ready to set up a view on our page node:
   >>> view = NodeView(m1p1, request)
 
 The elements responsible for presentation are controlled by a controller
-object:
+object; note that we have to provide a named template 'loops.node_macros' that
+is used to retrieve a macro used by NodeView:
 
   >>> from cybertools.browser.controller import Controller
+  >>> from loops.browser.util import node_macros
+  >>> from loops.browser.common import BaseView
+  >>> component.provideAdapter(node_macros, (BaseView,), name='loops.node_macros')
   >>> controller = Controller(view, request)
   >>> getattr(controller, 'skinName', None) is None
   True

search/browser.py

@@ -165,7 +165,9 @@ class SearchResults(BaseView):
         cat = self.catalog
         request = self.request
         type = request.get('search.3.type', 'loops:concept:*')
-        text = request.get('search.3.text').replace('(', ' ').replace(')', ' ')
+        text = request.get('search.3.text')
+        if text:  # there are a few characters that the index doesn't like
+            text = text.replace('(', ' ').replace(')', ' ')
         if not text and '*' in type:
             return None
         if type.endswith('*'):