--- ECHO_content/ECHO_collection.py	2004/05/06 13:29:45	1.56
+++ ECHO_content/ECHO_collection.py	2004/05/07 14:34:07	1.63
@@ -354,7 +354,7 @@ class ECHO_resource(Folder):
 		coordsnew=[]	
         
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordsnew)
-
+	self.viewClassification=viewClassification
         self.coords=coordsnew[0:]
         self.link=link
         self.metalink=metalink
@@ -577,6 +577,8 @@ class ECHO_collection(Folder, Persistent
     security=ClassSecurityInfo()
     meta_type='ECHO_collection'
 
+    displayTypes=displayTypes
+			
     def getTitle(self):
 	"""title"""
 	return self.title.encode('utf-8') 
@@ -642,14 +644,14 @@ class ECHO_collection(Folder, Persistent
                 element=getattr(object,entry)
                 try:
                     if element.meta_type in ["ECHO_collection","ECHO_group"]:
-                        collections+="<element name=\""+element.title+"\" url=\""+element.absolute_url()+"\">"
+                        collections+="<element name=\""+quote(element.title)+"\" url=\""+element.absolute_url()+"\">"
                         collections+=getCollection(element,depth)+"</element>\n"
                 except:
                     """nothing"""
             return collections
         
-
-        return "<collection>"+getCollection(self)+"</collection>"
+	ret="""<?xml version="1.0" encoding="utf-8" ?>"""
+        return ret+"<collection>"+getCollection(self)+"</collection>"
     
     def createJavaScript(self):
         """CreateJava"""
@@ -940,8 +942,8 @@ class ECHO_group(ECHO_collection):
 	def index_html(self):
 		"""standard page"""
 		displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)
-		if len(displayedObjects)==1: # nur ein Object dann redirect auf dieses Object
-			return self.REQUEST.RESPONSE.redirect(displayedObjects[0][1].absolute_url())
+		#if (len(displayedObjects)==1) and (displayedObjects[0][1].meta_type=="ECHO_collection"): # nur ein Object dann redirect auf dieses Object
+		#	return self.REQUEST.RESPONSE.redirect(displayedObjects[0][1].absolute_url())
 		
 		if 'index.html' in self.__dict__.keys():
 			return getattr(self,'index.html')()
@@ -1054,14 +1056,22 @@ class ECHO_root(Folder,Persistent,Implic
         else:
             retStr="<option>\n"
             
-        try:
+        try: # erste version contentTypes exists
             for contentType in self.ZopeFind(self.contentTypes,obj_metatypes=["ECHO_contentType"]):
                 if selected and (contentType[0]==selected):
                     retStr+="""<option selected value="%s">%s\n"""%(contentType[0],contentType[0])
                 else:                
                     retStr+="""<option value="%s">%s\n"""%(contentType[0],contentType[0])
         except:
-            """nothing"""
+		try:
+			for contentType in self.ZopeFind(self.standardMD,obj_metatypes=["OSAS_MetadataMapping"]):
+				if selected and (contentType[0]==selected):
+					retStr+="""<option selected value="%s">%s\n"""%(contentType[0],contentType[0])
+				else:                
+					retStr+="""<option value="%s">%s\n"""%(contentType[0],contentType[0])
+		except:
+			"""nothing"""
+			    
         return retStr
             
     def patchContentType(self,obj=None):
@@ -1082,7 +1092,39 @@ class ECHO_root(Folder,Persistent,Implic
 
                 
         return "changed all contenttypes in: "+self.title
-    
+
+
+    def patchViewClassification(self,obj=None):
+        """setze viewClassification heuristisch"""
+
+	def checkIfArrow(obj):
+		if hasattr(obj,'coords'):
+			for coordtemp in obj.coords:
+				if len(coordtemp)>3:
+					return 4
+			return None
+		return None
+	
+        if not obj:
+            obj = self
+            
+        entries=obj.ZopeFind(obj,obj_metatypes=['ECHO_resource','ECHO_collection','ECHO_group'])
+
+        for entry in entries:
+		
+		if checkIfArrow(entry[1]): 
+			setattr(entry[1],'viewClassification','view point')
+		else:
+			setattr(entry[1],'viewClassification','area')
+
+                #entry[1].contentType == entry[1].content_type
+
+                if entry[1].meta_type in ['ECHO_collection','ECHO_group']:
+                    entry[1].patchViewClassification(entry[1])    
+
+                
+        return "changed all contenttypes in: "+self.title
+
     def ECHO_newViewerLink(self,obj=None):
         """change links (:86 faellt weg)"""
 
@@ -1184,9 +1226,11 @@ class ECHO_root(Folder,Persistent,Implic
     def getPartnersXML(self):
         """partner liste als xml""" 
         partners=self.getPartners()
-        ret="<partners>"
-        for partner in partners:
-            ret+="""<partner id="%s" title="%s"/>\n"""%(partner.getId(),partner.title)
+        ret="""<?xml version="1.0" encoding="utf-8" ?>
+	<partners>"""
+        
+	for partner in partners:
+            ret+="""<partner id="%s" title="%s"/>\n"""%(partner.getId(),unicode(partner.title,'utf-8','replace'))
 
         return ret+"\n</partners>"