Changeset 119
- Timestamp:
- 12/26/05 08:22:07
- Files:
-
- qTopic/branches/plone2.1/patch.py (modified) (9 diffs)
- qTopic/branches/plone2.1/qTopic.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
qTopic/branches/plone2.1/patch.py
r118 r119 20 20 from Products.ATContentTypes.configuration import zconf 21 21 tool_config = zconf.atct_tool.topic_tool 22 23 from zLOG import LOG24 22 25 23 def _initializeTopicTool(self): … … 167 165 self.topic_metadata[catalog_name]={} 168 166 for i in metas: 169 if not self.topic_metadata .has_key(i):167 if not self.topic_metadata[catalog_name].has_key(i): 170 168 enabled = False 171 169 self.addMetadata(i, friendlyName='', enabled=enabled, catalog_name=catalog_name) … … 208 206 removed from the collection because they do no longer exist in the 209 207 catalog """ 210 211 208 metas = self.listCatalogMetadata(catalog_name) 212 209 configured_metadata = {} … … 224 221 defaults = (configured_metadata.has_key(i) and 225 222 configured_metadata[i]) or ('','',enabled) 226 LOG('updateMFC',1,i,catalog_name)227 223 self.addMetadata(i, friendlyName=defaults[0], 228 224 description=defaults[1], enabled=defaults[2], catalog_name=catalog_name) … … 233 229 if k not in metas: 234 230 self.removeMetadata(k) 235 236 231 237 232 … … 247 242 def listCatalogMetadata(self, catalog_name=CatalogTool.id): 248 243 """ Return a list of columns from portal_catalog. """ 249 pcatalog = getToolByName( self,catalog_name)244 pcatalog = getToolByName(self, catalog_name) 250 245 available = pcatalog.schema() 251 246 val = [ field for field in available ] … … 280 275 index_names = self.getIndexes(True, catalog_name) 281 276 else: 282 index_names = self.getIndexes( catalog_name)277 index_names = self.getIndexes(False, catalog_name) 283 278 index_dict = self.topic_indexes[catalog_name] 284 indexes = [index_dict[i] for i in index_names if index_dict.has_key(i)]279 indexes = [index_dict[i] for i in index_names] 285 280 286 281 field_list=[(f.index, f.friendlyName or f.index) for f in indexes] … … 293 288 meta_names = self.getAllMetadata(True, catalog_name) 294 289 else: 295 meta_names = self.getAllMetadata( catalog_name)290 meta_names = self.getAllMetadata(False, catalog_name) 296 291 meta_dict = self.topic_metadata[catalog_name] 297 meta = [meta_dict[i] for i in meta_names if meta_dict.has_key(i)]292 meta = [meta_dict[i] for i in meta_names] 298 293 299 294 field_list=[(f.index, f.friendlyName or f.index) for f in meta] … … 349 344 else: 350 345 meta_dec = [(i.lower(), i) for i in self.topic_metadata[catalog_name].keys()] 351 352 346 meta_dec.sort() 353 347 metadata = [i[1] for i in meta_dec] qTopic/branches/plone2.1/qTopic.py
r118 r119 152 152 """ 153 153 tool = getToolByName(self, TOOLNAME) 154 return tool.getMetadataDisplay(exclude,catalog_name=self.getCatalog()) 154 catalog_name=self.getCatalog() 155 return tool.getMetadataDisplay(exclude,catalog_name=catalog_name) 155 156 156 157 security.declareProtected(CMFCorePermissions.View, "queryCatalog")
