Changeset 100

Timestamp:

12/23/05 03:29:48

Author:

chervol

Message:

fixed all issues, atct_tool clearIndexes method added

Files:

• qTopic/branches/plone2.1/patch.py (modified) (9 diffs)
• qTopic/branches/plone2.1/skins/qtopic/atct_manageTopicIndex.cpt (modified) (2 diffs)

qTopic/branches/plone2.1/patch.py

@@ -20 +20 @@
-from Products.ATContentTypes.configuration import zconf
-tool_config = zconf.atct_tool.topic_tool
+
+from zLOG import LOG
-
-def _initializeTopicTool(self):
@@ -52 +54 @@
-    catalog_tool = getToolByName(self, catalog_name)
-    try:
-
+ 
-    except KeyError:
-        return ()
@@ -116 +118 @@
-    if criteria == None:
-        criteria = indexes[index].criteria
-
-    self.addIndex(index, friendlyName, description, enabled, criteria, catalog_name)
-
@@ -176 +177 @@
-    """ check if there are new indexes or if indexes must be removed from
-        the collection because they do no longer exist in the catalog """
-
-    indexes = self.listCatalogFields(catalog_name)
-    configured_indexes = {}
@@ -191 +191 @@
-        if not self.topic_indexes[catalog_name].has_key(i):
-            enabled = False
-
-            configured_indexes[i]) or ('','',enabled,None
+ configured_indexes[i]) or \
+('','',enabled,self.getCriteriaForIndex(i,True,catalog_name)
-            self.addIndex(i, friendlyName=defaults[0],
-                        description=defaults[1], enabled=defaults[2],
@@ -224 +224 @@
-            defaults = (configured_metadata.has_key(i) and
-                                    configured_metadata[i]) or ('','',enabled)
+            LOG('updateMFC',1,i,catalog_name)
-            self.addMetadata(i, friendlyName=defaults[0],
-
+, catalog_name=catalog_name
-
-    # now check the other way round
@@ -277 +278 @@
-    """ Return DisplayList of Indexes and their friendly names """
-    if enabled:
-
-
-
+, catalog_name
+
+catalog_name
-    index_dict = self.topic_indexes[catalog_name]
-    indexes = [index_dict[i] for i in index_names]
@@ -290 +291 @@
-    """ Return DisplayList of Metadata and their friendly names """
-    if enabled:
-
-
-
+, catalog_name
+
+catalog_name
-    meta_dict = self.topic_metadata[catalog_name]
-    meta = [meta_dict[i] for i in meta_names]
@@ -388 +389 @@
-    return 1
-
+def clearIndexes(self):
+    self.topic_indexes = {}
+    self.topic_metadata = {}
+
+ATTopicsTool.clearIndexes = clearIndexes
-
-

qTopic/branches/plone2.1/skins/qtopic/atct_manageTopicIndex.cpt

@@ -73 +73 @@
-          <input type="hidden" name="catalog" value="portal_catalog"
-                 tal:attributes="value python:catalog" />
-
+
-          <tal:indices tal:define="enabledOnly python:request.get('showEnabledOnly',True);
-
-
+ 
+ 
-
-          <h3 i18n:translate="heading_indices_fields_for_searching">
@@ -176 +176 @@
-                               tal:attributes="id string:${indexObj/index}_criteria;
-                                               tabindex tabindex/next;">
-
+, catalog_name=catalog
-                                    tal:attributes="value criterion/name;
-                                                    selected python:test(criterion['name'] in indexObj.criteria, 'selected', None);"