--- ECHO_content/ECHO_helpers.py	2004/12/10 19:33:09	1.32
+++ ECHO_content/ECHO_helpers.py	2005/02/07 18:29:07	1.40
@@ -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
@@ -383,12 +388,20 @@ def checkOnlyOneInGroup(object):
 		return displayedObjects[0][1]
 	else:		return object
 
-def getSubCols(self,sortfield="weight",subColTypes= displayTypes,sortFieldMD=None):
+def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None):
 
+	def sort(x,y):
+		return cmp(x[0],y[0])
+	
 	def sortfnc(sortfield,x,y):
-		xa=x[1].getMDValue(sortfield)
-		ya=y[1].getMDValue(sortfield)
-		print xa,ya
+		try:
+			xa=x[1].getMDValue(sortfield)
+		except:
+			xa=""
+		try:
+			ya=y[1].getMDValue(sortfield)
+		except:
+			ya=""
 		return cmp(xa,ya)
 	
 	sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y))
@@ -401,29 +414,29 @@ def getSubCols(self,sortfield="weight",s
             object=entry[1]
             ids.append(object)
 
-        try:
-            sortfield=self.sortfield
-        except:
-            """nothing"""
+	if not sortfield:
+            sortfield=getattr(self,'sortfield','weight')
+
             
         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()
+		tmplist.sort(sort)
 	else:
 		tmplist.sort(sortWithMD(sortFieldMD))
-		
+	
         return [x for (key,x) in tmplist]
 
 def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
@@ -460,8 +473,6 @@ def reloadMetaDataFromStorage(self,RESPO
 	    for resource in resources:
 		    x=str(resource[1].copyIndex_meta2echo_resource())+"<br>"
 		    ret+=x
-		    #print x
-		    
 
 	    if RESPONSE is not None:
 		    #RESPONSE.redirect('./manage_main')
@@ -580,23 +591,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)
@@ -636,7 +670,7 @@ def writeMetadata(url,metadict,project=N
 	"""Einlesen der Metadaten und und erstellen des geaenderten XML file"""
 
 	def updateTextToolNode(tag,value):
-		#print dom,tag,value
+
 		metanode=dom.getElementsByTagName('texttool')[0]
 		try:
 			nodeOld=metanode.getElementsByTagName(tag)
@@ -780,7 +814,9 @@ def readMetadata(url):
         for node in metacontent:
 		try:
 			#print urllib.unquote(getText(node.childNodes)),getText(node.childNodes)
-			metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
+			#metadict[re.sub('-','_',node.tagName.lower())]=urllib.unquote(getText(node.childNodes))
+			metadict[re.sub('-','_',node.tagName.lower())]=getText(node.childNodes)
+		
 		except:
 			"""nothing"""