--- ECHO_content/ECHO_helpers.py	2004/12/02 20:11:49	1.31
+++ ECHO_content/ECHO_helpers.py	2005/01/21 17:56:01	1.36
@@ -4,7 +4,7 @@ import socket
 import urllib
 import string
 import xml.dom.minidom
-from types import *
+import types
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from OFS.SimpleItem import SimpleItem
 from Globals import package_home
@@ -37,7 +37,9 @@ class ECHO_basis:
 	    """showrdf"""
             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
 	    ret="""<?xml version="1.0" encoding="utf-8"?>\n<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"  xmlns:ECHONAVIGATION="http://www.echo.eu/rdf#">\n"""
-	    ret+=self.getRDF(urn="echo:colllectionroot")+"\n"
+
+	    ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+
 
 	    ret+="""</RDF:RDF>"""
     	    return ret 
@@ -221,11 +223,12 @@ class ECHO_basis:
 	"""generate img-tag for map"""
 	bt = BrowserCheck(self)
 	tag = ""
-	#src = self.REQUEST['URL1'] + "/overview"
 	src = self.getOverview().absolute_url()
 	if bt.isN4:
+	    # N4 needs ilayer to create an id
 	    tag += '<ilayer id="overview" visibility="show"><img src="%s"></ilayer>'%src
 	else:
+	    # img with id
 	    tag += '<img id="overview" src="%s" />'%src
 	return tag
         
@@ -242,14 +245,17 @@ class ECHO_basis:
 	    text = ob.getLabel()
 	if text is None:
 	    text = "link"
+	tiptext = ob.getText()
 	tag = ""
 	if bt.isN4:
+	    # N4 needs layer for highlighting
 	    tag += '<ilayer id="a.%s"><a onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank"'%(id,id,id,link)
 	    tag += ">" + text + "</a></ilayer>"
 	else:
+	    # a-element
 	    tag = '<a id="a.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank"'%(id,id,id,link)
-	    if ob.text:
-		tag += ' title="%s"'%ob.text
+	    if tiptext:
+		tag += ' title="%s"'%tiptext
 	    tag += ">" + text + "</a>"
 	return tag
 
@@ -262,6 +268,7 @@ class ECHO_basis:
 	tag = ""
 
 	if bt.isN4:
+	    # N4 needs layer and img elements
 	    tag += '<layer id="i.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)">'%(id,id,id)
 	    if ob.isTypeArrow():
 	        rot = ob.angle
@@ -273,21 +280,29 @@ class ECHO_basis:
 		tag += ' /></a>'
 	    tag += '</layer>'
 	else:
+	    # create a-element
 	    tag = '<a id="b.%s" onmouseover="highlightPair(\'%s\', true)" onmouseout="highlightPair(\'%s\', false)" href="%s" target="_blank">'%(id,id,id,link)
 	    if ob.isTypeArrow():
 		rot = ob.angle
 		if bt.isIEWin and bt.versIE > 5:
+		    # IE/Win 5.5 has "feature" for PNG transparency
 		    tag += '<span id="i.%s" style="position:absolute; top:-100px; left:-100px; border-style:none; border-width=1px; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\'%s&rot=%s\');"><img style="visibility:hidden" src="%s&rot=%s" /></span>'%(id,arrowsrc,rot,arrowsrc,rot)
 		else:
+		    # arrow image
 		    tag += '<img id="i.%s" src="%s&rot=%s" border="1" style="position:absolute; top:-100px; left:-100px; border-style:none;" />'%(id,arrowsrc,rot)
 	    else:
-		if bt.isIEWin:
-		    tag += '<div id="i.%s" style="position:absolute; top:-100px; left:-100px;background:url(area_img)"'%(id)
+		if bt.isIE:
+		    # IE needs transparent img for area
+		    tag += '<img id="i.%s" border="0" style="position:absolute; top:-100px; left:-100px;" src="trans_img"'%(id)
+		    if tiptext:
+			tag += ' title="%s"'%tiptext
+		    tag += " />"
 		else:
+		    # div for area
 		    tag += '<div id="i.%s" style="position:absolute; top:-100px; left:-100px;"'%(id)
-		if tiptext:
-		    tag += ' title="%s"'%tiptext
-		tag += '> </div>'
+		    if tiptext:
+			tag += ' title="%s"'%tiptext
+		    tag += '> </div>'
 	    tag += '</a>'
 	return tag
 
@@ -297,7 +312,7 @@ class ECHO_basis:
 
 def toList(field):
     """Einzelfeld in Liste umwandeln"""
-    if type(field)==StringType:
+    if type(field)==types.StringType:
         return [field]
     else:
         return field
@@ -370,12 +385,12 @@ def checkOnlyOneInGroup(object):
 		return displayedObjects[0][1]
 	else:		return object
 
-def getSubCols(self,sortfield="weight",subColTypes= displayTypes,sortFieldMD=None):
+def getSubCols(self, sortfield="weight", subColTypes=displayTypes, sortFieldMD=None):
 
 	def sortfnc(sortfield,x,y):
 		xa=x[1].getMDValue(sortfield)
 		ya=y[1].getMDValue(sortfield)
-		print xa,ya
+		#print xa,ya
 		return cmp(xa,ya)
 	
 	sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y))
@@ -394,23 +409,24 @@ def getSubCols(self,sortfield="weight",s
             """nothing"""
             
         tmplist=[]
-        for x in ids:
-            if hasattr(x,sortfield):
-                try:
 
-                    x=int(x)
-                except:
-                    """nothing"""
-                tmp=getattr(x,sortfield)
-            else:
-                tmp=10000000
-            tmplist.append((tmp,x))
+        for x in ids:
+		if hasattr(x,sortfield):
+			try:
+				tmp=int(getattr(x,sortfield))
+			except:
+				tmp=getattr(x,sortfield)
+				
+		else:
+			tmp=10000000
+			
+		tmplist.append((tmp,x))
 
 	if not sortFieldMD:
 		tmplist.sort()
 	else:
 		tmplist.sort(sortWithMD(sortFieldMD))
-		
+	
         return [x for (key,x) in tmplist]
 
 def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
@@ -567,23 +583,46 @@ def checkDiffs(self,metadict):
 	    return diffs
     
 
-def zptFile(self, path):
+def zptFile(self, path, orphaned=False):
     """returns a page template file from the product"""
-    pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)
+    if orphaned:
+	# unusual case
+	pt=PageTemplateFile(os.path.join(package_home(globals()), path))
+    else:
+	pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)
     return pt
 
 
-def sendFile(self, filename, type):
-    """sends an object or a local file (in the product) as response"""
+def findObjectPath(startobject, filename):
+    """returns the object with the name filename starting at startobject"""
+    if startobject is None:
+	return None
     paths = filename.split('/')
-    object = self
-    # look for an object called filename
+    object = startobject
     for path in paths:
         if hasattr(object, path):
 	    object = getattr(object, path)
 	else:
 	    object = None
 	    break
+    return object
+
+
+def zptObjectOrFile(self, filename, localdir='zpt', orphaned=False):
+    """returns a page template instance or a file from the product"""
+    # look for an object called path
+    pt = findObjectPath(self, filename)
+    # the object should also not be a python function
+    if (pt is None) or isinstance(pt, types.FunctionType):
+	# get a ZPT file
+	pt = zptFile(self, localdir+'/'+filename, orphaned=orphaned)
+    return pt
+
+
+def sendFile(self, filename, type):
+    """sends an object or a local file (in the product) as response"""
+    # look for an object called filename
+    object = findObjectPath(self, filename)
     if object:
 	# if the object exists then send it
 	return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE)