Changeset 117
- Timestamp:
- 12/26/05 04:43:09
- Files:
-
- qTopic/branches/plone2.1/patch.py (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
qTopic/branches/plone2.1/patch.py
r116 r117 73 73 registry """ 74 74 if criteria is None: criteria = self.getCriteriaForIndex(index, catalog_name) 75 if self.topic_indexes [catalog_name].has_key(index):76 objIndex = self.topic_indexes[ catalog_name][index]75 if self.topic_indexes.has_key(index): 76 objIndex = self.topic_indexes[index] 77 77 objIndex.friendlyName=friendlyName 78 78 objIndex.description=description … … 91 91 """ Add a new metadata field along with descriptive information to the 92 92 metadata registry """ 93 if self.topic_metadata [catalog_name].has_key(metadata):94 objMeta = self.topic_metadata[ catalog_name][metadata]93 if self.topic_metadata.has_key(metadata): 94 objMeta = self.topic_metadata[metadata] 95 95 objMeta.friendlyName=friendlyName 96 96 objMeta.description=description … … 137 137 def removeIndex(self, index, catalog_name=CatalogTool.id): 138 138 """ Removes an existing index from the registry """ 139 if self.topic_indexes [catalog_name].has_key(index):139 if self.topic_indexes.has_key(index): 140 140 del self.topic_indexes[catalog_name][index] 141 141 self._p_changed=1 … … 144 144 def removeMetadata(self, metadata, catalog_name=CatalogTool.id): 145 145 """ Removes an existing metadata field from the registry """ 146 if self.topic_metadata [catalog_name].has_key(metadata):146 if self.topic_metadata.has_key(metadata): 147 147 del self.topic_metadata[catalog_name][metadata] 148 148 self._p_changed=1 … … 152 152 """ create indexes for all indexes in the catalog """ 153 153 indexes = self.listCatalogFields() 154 if not self.topic_indexes [catalog_name].has_key(catalog_name):154 if not self.topic_indexes.has_key(catalog_name): 155 155 self.topic_indexes[catalog_name]={} 156 156 for i in indexes: … … 163 163 def createInitialMetadata(self, catalog_name=CatalogTool.id): 164 164 """ create metadata for all indexes in the catalog """ 165 metas = self.listCatalogMetadata( catalog_name)165 metas = self.listCatalogMetadata() 166 166 if not self.topic_metadata.has_key(catalog_name): 167 167 self.topic_metadata[catalog_name]={} … … 209 209 catalog """ 210 210 211 metas = self.listCatalogMetadata( catalog_name)211 metas = self.listCatalogMetadata() 212 212 configured_metadata = {} 213 213 for meta in tool_config.metadata: … … 282 282 index_names = self.getIndexes(catalog_name) 283 283 index_dict = self.topic_indexes[catalog_name] 284 indexes = [index_dict[i] for i in index_names ]284 indexes = [index_dict[i] for i in index_names if index_dict.has_key(i)] 285 285 286 286 field_list=[(f.index, f.friendlyName or f.index) for f in indexes] … … 295 295 meta_names = self.getAllMetadata(catalog_name) 296 296 meta_dict = self.topic_metadata[catalog_name] 297 meta = [meta_dict[i] for i in meta_names ]297 meta = [meta_dict[i] for i in meta_names if meta_dict.has_key(i)] 298 298 299 299 field_list=[(f.index, f.friendlyName or f.index) for f in meta] … … 371 371 raise AttributeError('Metadata ' + str(metadata) + ' not found') 372 372 373 def manage_saveTopicSetup(self, REQUEST=None ):373 def manage_saveTopicSetup(self, REQUEST=None, catalog_name=CatalogTool.id): 374 374 """ Set indexes and metadata from form """ 375 375 if REQUEST==None: 376 376 return 'Nothing saved.' 377 catalog_name=REQUEST.get('catalog', CatalogTool.id) 377 378 378 data = REQUEST.get('index', []) 379 379 for index in data:
