--- OSA_system2/OSAS_metadata.py	2010/02/15 19:09:10	1.17
+++ OSA_system2/OSAS_metadata.py	2010/09/01 13:26:16	1.18
@@ -172,20 +172,29 @@ class OSAS_Metadata(Folder):
         else:
             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
             return ret
-        
-    def showOverviewXML(self,RESPONSE):
+    
+  
+    def showOverviewXML(self,RESPONSE=None,wrapped=False):
         """gives an overview over the Metadata stored in this folder"""
-        ret="""<metadata name="%s">"""%self.getId()
+        ret=""
+        if wrapped:
+            ret+="""<metadataExport>"""
+        ret+="""<metadata name="%s">"""%self.getId()
         ret+=self.showGenericXML()
-        for entry in self.ZopeFind(self,obj_metatypes=['OSAS_MetadataMapping']):
+        for entry in self.ZopeFind(self,obj_metatypes=['OSAS_MetadataMapping__neu']):
             ret+=entry[1].showSetXML()
 
+        for entry in self.ZopeFind(self,obj_metatypes=['OSAS_Metadata__neu']):
+            ret+=entry[1].showOverviewXML()
+
         ret+="</metadata>"
 
+        if wrapped:
+            ret+="""</metadataExport>"""
         if not RESPONSE:
             return ret
         else:
-            self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
+            RESPONSE.setHeader('Content-Type','text/xml')
             return ret
         
     def generateMappingList(self):
@@ -196,7 +205,9 @@ class OSAS_Metadata(Folder):
             #print dict
             obj=getattr(self,dict)
             if hasattr(obj,'meta_type'):
-                if obj.meta_type=="OSAS_MetadataMapping__neu":
+                logging.debug("generateMappungList read type:"+repr(obj.meta_type))
+                if ((obj.meta_type=="OSAS_MetadataMapping__neu") or (obj.meta_type=="MetadataMapping")): #metadatamapping is the newer type
+                    logging.debug("generateMappungListadded:"+repr(obj.getId()))
                     mapping[obj.getId()]=obj.generateMappingHash()
         
         return mapping
@@ -205,8 +216,9 @@ class OSAS_Metadata(Folder):
         """erzeuge spezifisches Mapping"""
         
         hash=self.generateMappingList()
-        
+        logging.debug("generateMappingForType:"+type)
         for key in hash.keys():
+            logging.debug("generateMappingForType comparing:"+key.lower()+type.lower())
             if (key.lower() == type.lower()):
                 if clean=="yes":
                     temp={}
@@ -642,4 +654,4 @@ def manage_addMetadata(self,id,shortDesc
         RESPONSE.redirect('manage_main')
 
             
-InitializeClass(OSAS_Metadata)
+