Changeset 119

Show
Ignore:
Timestamp:
12/26/05 08:22:07
Author:
chervol
Message:

global fixup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • qTopic/branches/plone2.1/patch.py

    r118 r119  
    2020from Products.ATContentTypes.configuration import zconf 
    2121tool_config = zconf.atct_tool.topic_tool 
    22  
    23 from zLOG import LOG 
    2422 
    2523def _initializeTopicTool(self): 
     
    167165        self.topic_metadata[catalog_name]={} 
    168166    for i in metas: 
    169         if not self.topic_metadata.has_key(i): 
     167        if not self.topic_metadata[catalog_name].has_key(i): 
    170168            enabled = False 
    171169            self.addMetadata(i, friendlyName='', enabled=enabled, catalog_name=catalog_name) 
     
    208206        removed from the collection because they do no longer exist in the 
    209207        catalog """ 
    210  
    211208    metas = self.listCatalogMetadata(catalog_name) 
    212209    configured_metadata = {} 
     
    224221            defaults = (configured_metadata.has_key(i) and 
    225222                                    configured_metadata[i]) or ('','',enabled) 
    226             LOG('updateMFC',1,i,catalog_name) 
    227223            self.addMetadata(i, friendlyName=defaults[0], 
    228224                            description=defaults[1], enabled=defaults[2], catalog_name=catalog_name) 
     
    233229        if k not in metas: 
    234230            self.removeMetadata(k) 
    235  
    236231 
    237232 
     
    247242def listCatalogMetadata(self, catalog_name=CatalogTool.id): 
    248243    """ Return a list of columns from portal_catalog. """ 
    249     pcatalog = getToolByName( self,catalog_name) 
     244    pcatalog = getToolByName(self, catalog_name) 
    250245    available = pcatalog.schema() 
    251246    val = [ field for field in available ] 
     
    280275        index_names = self.getIndexes(True, catalog_name) 
    281276    else: 
    282         index_names = self.getIndexes(catalog_name) 
     277        index_names = self.getIndexes(False, catalog_name) 
    283278    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
    285280 
    286281    field_list=[(f.index, f.friendlyName or f.index) for f in indexes] 
     
    293288        meta_names = self.getAllMetadata(True, catalog_name) 
    294289    else: 
    295         meta_names = self.getAllMetadata(catalog_name) 
     290        meta_names = self.getAllMetadata(False, catalog_name) 
    296291    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
    298293 
    299294    field_list=[(f.index, f.friendlyName or f.index) for f in meta] 
     
    349344    else: 
    350345        meta_dec = [(i.lower(), i) for i in self.topic_metadata[catalog_name].keys()] 
    351  
    352346    meta_dec.sort() 
    353347    metadata = [i[1] for i in meta_dec] 
  • qTopic/branches/plone2.1/qTopic.py

    r118 r119  
    152152        """ 
    153153        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) 
    155156 
    156157    security.declareProtected(CMFCorePermissions.View, "queryCatalog")