--- ECHO_content/ECHO_helpers.py	2005/01/18 15:40:03	1.33
+++ ECHO_content/ECHO_helpers.py	2005/01/31 11:15:50	1.37
@@ -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 
@@ -95,6 +97,7 @@ class ECHO_basis:
         
     def getTitle(self):
 	"""title"""
+	return self.decode(self.title)
 	try:
 		return self.title.encode('utf-8','ignore') 
 	except:
@@ -103,6 +106,8 @@ class ECHO_basis:
 	
     def getLabel(self):
 	"""title"""
+
+	return self.decode(self.label)
 	try:
 		return self.label.encode('utf-8','ignore') 
 	except:
@@ -310,7 +315,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
@@ -388,7 +393,7 @@ def getSubCols(self, sortfield="weight",
 	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))
@@ -407,23 +412,24 @@ def getSubCols(self, sortfield="weight",
             """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']):
@@ -583,7 +589,7 @@ def checkDiffs(self,metadict):
 def zptFile(self, path, orphaned=False):
     """returns a page template file from the product"""
     if orphaned:
-	# unusual case (only for macro templates)
+	# unusual case
 	pt=PageTemplateFile(os.path.join(package_home(globals()), path))
     else:
 	pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)
@@ -591,7 +597,7 @@ def zptFile(self, path, orphaned=False):
 
 
 def findObjectPath(startobject, filename):
-    """returns the object with the filename starting at startobject"""
+    """returns the object with the name filename starting at startobject"""
     if startobject is None:
 	return None
     paths = filename.split('/')
@@ -609,7 +615,8 @@ def zptObjectOrFile(self, filename, loca
     """returns a page template instance or a file from the product"""
     # look for an object called path
     pt = findObjectPath(self, filename)
-    if pt is None:
+    # 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