[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/TopicIndex - FilteredSet.py:1.1.2.5 TopicIndex.py:1.1.2.5

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/Products/PluginIndexes/TopicIndex
In directory cvs.zope.org:/tmp/cvs-serv6176

Modified Files:
      Tag: ajung-topicindex
	FilteredSet.py TopicIndex.py 
Log Message:


=== Zope/lib/python/Products/PluginIndexes/TopicIndex/FilteredSet.py 1.1.2.4 => 1.1.2.5 ===
 __version__ = '$Id$'
 
-
 from BTrees.IIBTree import IISet
 from Persistence import Persistent
 
@@ -96,7 +95,7 @@
 
         self.id   = id
         self.expr = expr
-        self.ids  = IISet()
+        self.clear()
 
     
     def clear(self):
@@ -130,10 +129,10 @@
 
     def index_object(self, documentId, o):
 
-        # Lame,lame,lame - just for testing purposes
-        res = eval(self.expr)
-        if res:
-            self.ids.insert(documentId)
+        try:
+            if eval(self.expr): self.ids.insert(documentId)
+        except: 
+            pass
 
 
 class CatalogFilteredSet(FilteredSetBase):
@@ -144,9 +143,8 @@
         pass
 
 
-
-
 def factory(f_id, f_type, expr):
+    """ factory function for FilteredSets """
 
     if f_type=='PythonFilteredSet':
         return PythonFilteredSet(f_id, expr)


=== Zope/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py 1.1.2.4 => 1.1.2.5 ===
     
     manage_options= (
-        {'label': 'Settings',     
-         'action': 'manage_main',
-         'help': ('TopicIndex','TopicIndex_Settings.stx')},
         {'label': 'FilteredSets',     
-         'action': 'addFilteredSetForm',
+         'action': 'manage_workspace',
          'help': ('TopicIndex','TopicIndex_Settings.stx')},
     )
 
-    addFilteredSetForm = DTMLFile('dtml/addFilteredSet',globals())
+    manage_workspace = DTMLFile('dtml/manageTopicIndex',globals())
 
     query_options = ['query','operator']
 
@@ -169,7 +166,7 @@
         return n
 
 
-    numObject = __len__
+    numObjects = "does not apply"
 
 
     def keys(self):   pass
@@ -259,7 +256,7 @@
         self.addFilteredSet(filterId, typeFilteredSet, expr)
 
         if RESPONSE:
-            RESPONSE.redirect(URL1+'/addFilteredSetForm?manage_tabs_message=FilteredSet%20added')
+            RESPONSE.redirect(URL1+'/manage_workspace?manage_tabs_message=FilteredSet%20added')
 
 
     def manage_delFilteredSet(self, filterIds, URL1, \
@@ -270,7 +267,7 @@
             self.delFilteredSet(filterId)
 
         if RESPONSE:
-            RESPONSE.redirect(URL1+'/addFilteredSetForm?manage_tabs_message=FilteredSet(s)%20deleted')
+            RESPONSE.redirect(URL1+'/manage_workspace?manage_tabs_message=FilteredSet(s)%20deleted')
 
 
     def manage_clearFilteredSet(self, filterIds, URL1, \
@@ -281,11 +278,9 @@
             self.clearFilteredSet(filterId)
 
         if RESPONSE:
-            RESPONSE.redirect(URL1+'/addFilteredSetForm?manage_tabs_message=FilteredSet(s)%20cleared')
+            RESPONSE.redirect(URL1+'/manage_workspace?manage_tabs_message=FilteredSet(s)%20cleared')
 
     index_html = DTMLFile('dtml/index', globals())
-    manage_workspace = DTMLFile('dtml/manageTopicIndex', globals())
-    manage_main = DTMLFile('dtml/manageTopicIndex', globals())
 
 
 manage_addTopicIndexForm = DTMLFile('dtml/addTopicIndex', globals())