--- ECHO_content/ECHO_collection.py	2004/05/06 13:29:45	1.56
+++ ECHO_content/ECHO_collection.py	2004/05/07 16:37:09	1.68
@@ -76,6 +76,28 @@ def getText(nodelist):
     return rc
 
 
+def sendFile(self, filename, type):
+    """sends an object or a local file (in the product) as response"""
+    paths = filename.split('/')
+    object = self
+    # look for an object called filename
+    for path in paths:
+        if hasattr(object, path):
+	    object = getattr(object, path)
+	else:
+	    object = None
+	    break
+    if object:
+	# if the object exists then send it
+	object()
+    else:
+	# send a local file with the given content-type
+	fn = os.path.join(package_home(globals()), filename)
+	self.REQUEST.RESPONSE.setHeader("Content-Type", type)
+	self.REQUEST.RESPONSE.write(file(fn).read())
+    return
+
+
 def readMetadata(url):
     """Methoden zum Auslesen der Metadateninformation zu einer Resource
     Vorerst noch Typ bib"""
@@ -354,7 +376,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 +599,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,27 +666,31 @@ 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"""
-        ret=javaScriptMain
+        #ret=javaScriptMain
+        ret=""
 
-        dynamical=""
+        dynamical="\n"
         for ob in self.getGraphicCoords():
 	    if ob[4][4] == "":	
-	        dynamical+="""Coords.push(new Coord('%s', Img, %s));\n"""%(ob[1],ob[0])
+	        #dynamical+="""Coords.push(new Coord('%s', Img, %s));\n"""%(ob[1],ob[0])
+	        dynamical+="""addArea('%s', 'overview', %s, 'area');\n"""%(ob[1],ob[0])
 	    else:
-	        dynamical+="""Coords.push(new Coord('%s', Img, %s));//%s\n"""%(ob[1],ob[0],ob[4][4])
-		dynamical+="ShowArrow(new getObj('i.%s'),Img,%s);\n"%(ob[1],ob[0])
-        ret+=javaHandler%dynamical
+	        dynamical+="""addArea('%s', 'overview', %s, 'arrow');\n"""%(ob[1],ob[0])
+		#dynamical+="""Coords.push(new Coord('%s', Img, %s));//%s\n"""%(ob[1],ob[0],ob[4][4])
+		#dynamical+="ShowArrow(new getObj('i.%s'),Img,%s);\n"%(ob[1],ob[0])
+	#ret+=javaHandler%dynamical
+        ret+=dynamical
         return ret
     
     security.declarePublic('getCreditObject')
@@ -874,32 +902,40 @@ class ECHO_collection(Folder, Persistent
         else:
             return []
 
+    def area_img(self):
+        """area image"""
+        sendFile(self, 'images/red.gif', 'image/gif')
+        return 
+
+    def hl_lib_js(self):
+        """javascript"""
+        sendFile(self, 'js/hl_lib.js', 'text/plain')
+        return 
+
+    def js_lib_js(self):
+        """javascript"""
+        sendFile(self, 'js/js_lib.js', 'text/plain')
+        return 
 
         
     def getGraphicCoords(self):
         """Give list of coordinates"""
-        subColTypes=['ECHO_collection','ECHO_externalLink','ECHO_resource']
+        subColTypes=['ECHO_collection','ECHO_resource']
         ids=[]
-        for entry in self.__dict__.keys():
-            object=getattr(self,entry)
-            try:
-                if object.meta_type in subColTypes:
-                    for coordtemp in object.coords:
-                        if len(coordtemp)>3:
-                            coord=coordtemp[0:4]
-                            if hasattr(object,'label') and not object.label=="":
-                                ids.append([string.join(coord,", "),object.getId(),object.label,object,coordtemp])
-                            elif hasattr(object,'title'):
-                                if not object.title=="":
-                                    ids.append([string.join(coord,", "),object.getId(),object.title,object,coordtemp])
-                                else:
-                                    ids.append([string.join(coord,", "),object.getId(),object.getId(),object,coordtemp])
-                            else:
-                                ids.append([string.join(coord,", "),object.getId(),object.getId(),object,coordtemp])
-                    
-            except:
-                """nothing"""
-
+        for entrySearch in self.ZopeFind(self,obj_metatypes=subColTypes):
+            object=entrySearch[1]
+            if hasattr(object,'coords'):
+                for coordtemp in object.coords:
+                    if len(coordtemp)>3:
+                        coord=coordtemp[0:4]
+                        label=""
+                        if hasattr(object,'label') and not object.label=="":
+                            label=object.label
+                        elif hasattr(object,'title') and not object.title=="":
+                            label=object.title
+                        else:
+                            label=object.getId()
+                        ids.append([string.join(coord,", "),object.getId(),label,object,coordtemp,object.viewClassification])
         return ids
     
 
@@ -940,8 +976,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 +1090,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 +1126,42 @@ 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:
+				print obj.title,len(coordtemp)
+				if (len(coordtemp)>4) and not (coordtemp[4]==''):
+					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]):
+			print "VP"
+			setattr(entry[1],'viewClassification','view point')
+		else:
+			print "area"
+			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 +1263,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>"