--- ECHO_content/ECHO_collection.py	2004/05/07 14:43:07	1.64
+++ ECHO_content/ECHO_collection.py	2004/05/07 14:51:02	1.65
@@ -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"""
@@ -655,16 +677,20 @@ class ECHO_collection(Folder, Persistent
     
     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')
@@ -876,6 +902,20 @@ 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):
@@ -889,16 +929,14 @@ class ECHO_collection(Folder, Persistent
                     for coordtemp in object.coords:
                         if len(coordtemp)>3:
                             coord=coordtemp[0:4]
+			    label=""
                             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])
-                    
+                                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.getViewClassification()])
             except:
                 """nothing"""