--- OSA_system2/OSAS_metadata.py 2005/04/25 19:55:30 1.8 +++ OSA_system2/OSAS_metadata.py 2005/10/10 19:10:33 1.10 @@ -41,7 +41,7 @@ class OSAS_MetadataMapping(SimpleItem): for fieldName in arglist.keys(): setattr(self,"md_"+fieldName,arglist[fieldName]) - + manage_options = SimpleItem.manage_options+( {'label':'Main Config','action':'changeMetadataMappingForm'}, ) @@ -110,7 +110,7 @@ class OSAS_MetadataMapping(SimpleItem): if RESPONSE is not None: RESPONSE.redirect('manage_main') - + manage_workspace=changeMetadataMappingForm def manage_addMetadataMappingForm(self): """interface for adding the OSAS_root""" @@ -184,29 +184,35 @@ class OSAS_Metadata(Folder): def generateMappingList(self): """Erzeuge Mapping""" mapping={} + for dict in self.__dict__: #print dict obj=getattr(self,dict) if hasattr(obj,'meta_type'): - if obj.meta_type=="OSAS_MetadataMapping": + print obj.meta_type + if obj.meta_type=="OSAS_MetadataMapping__neu": mapping[obj.getId()]=obj.generateMappingHash() + return mapping def generateMappingForType(self,type,clean="yes"): """erzeuge spezifisches Mapping""" + hash=self.generateMappingList() - if hash.has_key(type): - if clean=="yes": - temp={} - for x in hash[type].keys(): - if not hash[type][x]=="": - temp[x]=hash[type][x] - return temp - else: - return hash[type] - else: - return {} + for key in hash.keys(): + if (key.lower() == type.lower()): + if clean=="yes": + temp={} + for x in hash[key].keys(): + if not hash[key][x]=="": + temp[x]=hash[key][x] + return temp + else: + + return hash[key] + + return {} def getFieldList(self): """erzeuge string aus fields""" @@ -266,7 +272,7 @@ class OSAS_Metadata(Folder): def getDisplayFieldsAsStr(self,indexMeta): ret=[] - try: + try: if indexMeta and not (indexMeta==""): dom=xml.dom.pulldom.parseString(indexMeta) @@ -291,8 +297,8 @@ class OSAS_Metadata(Folder): return "; ".join(ret) else: return "" - except: - return "" + except: + return "" def getDisplayFieldsAsStrOLD(self,indexMeta): """Gebe display fields als string zurück @param path: Pfad zum Object