--- ECHO_content/ECHO_helpers.py	2005/01/21 13:29:15	1.35
+++ ECHO_content/ECHO_helpers.py	2005/02/11 11:35:40	1.44
@@ -25,7 +25,7 @@ def content_html(self,type):
             obj=getattr(self,type+"_template")
             return obj()
         else:
-            pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_%s_template_standard.zpt'%type).__of__(self)
+	    pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%type)).__of__(self)
             pt.content_type="text/html"
             return pt()
     
@@ -33,11 +33,20 @@ def content_html(self,type):
 
 class ECHO_basis:
     """basis eigenschaften fuer echo objekte"""
+    security=ClassSecurityInfo()
+    security.declarePublic('getImageTag')
+    def getImageTag(self):
+	    """sollte uerberschrieben werden, falls von der Klasse eine imagetag zurueckkommt"""
+	    
+	    return ""
+    
     def showRDF(self):
 	    """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.urn(getRDF="echo:colllectionroot")+"\n"
+
+	    ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+
 
 	    ret+="""</RDF:RDF>"""
     	    return ret 
@@ -95,6 +104,7 @@ class ECHO_basis:
         
     def getTitle(self):
 	"""title"""
+	return self.decode(self.title)
 	try:
 		return self.title.encode('utf-8','ignore') 
 	except:
@@ -103,6 +113,8 @@ class ECHO_basis:
 	
     def getLabel(self):
 	"""title"""
+
+	return self.decode(self.label)
 	try:
 		return self.label.encode('utf-8','ignore') 
 	except:
@@ -383,32 +395,53 @@ 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,searchMD=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))
         ids=[]
 	displayedObjects=self.ZopeFind(self,obj_metatypes=subColTypes)
-	
+
 	
 	for entry in displayedObjects:
-            
-            object=entry[1]
-            ids.append(object)
 
-        try:
-            sortfield=self.sortfield
-        except:
-            """nothing"""
+			
+		object=entry[1]
+		if searchMD and hasattr(object,'getMDValue'):
+			flag=0
+			for field in searchMD.keys():
+				if object.getMDValue(field)==searchMD[field]:
+					flag=1
+				else:
+					flag=0
+					break
+			if flag==1:
+				ids.append(object)
+		else:
+			ids.append(object)
+
+	if not sortfield:
+            sortfield=getattr(self,'sortfield','weight')
+
             
         tmplist=[]
 
         for x in ids:
+		
 		if hasattr(x,sortfield):
 			try:
 				tmp=int(getattr(x,sortfield))
@@ -421,7 +454,7 @@ def getSubCols(self, sortfield="weight",
 		tmplist.append((tmp,x))
 
 	if not sortFieldMD:
-		tmplist.sort()
+		tmplist.sort(sort)
 	else:
 		tmplist.sort(sortWithMD(sortFieldMD))
 	
@@ -461,8 +494,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')
@@ -660,7 +691,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)
@@ -804,7 +835,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"""