--- ECHO_content/ECHO_helpers.py	2005/01/19 19:38:55	1.34
+++ ECHO_content/ECHO_helpers.py	2005/03/22 20:50:21	1.46
@@ -12,7 +12,7 @@ import Globals
 from AccessControl import ClassSecurityInfo
 import os.path
 
-displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder']
+displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder','ECHO_movie']
 
 def content_html(self,type):
         """template fuer content"""
@@ -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,17 +33,37 @@ 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.getRDF(urn="echo:colllectionroot")+"\n"
+
+	    ret+=self.getRDF(urn="echo:collectionroot")+"\n"
+
 
 	    ret+="""</RDF:RDF>"""
     	    return ret 
 
   
+    def RDF(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.getRDF(urn=self.absolute_url())+"\n"
+
+
+	    ret+="""</RDF:RDF>"""
+    	    return ret 
 
+  
     def createSubElementRDF(self,urn=None):
 	    """rdf list"""
 	    if not urn:
@@ -95,6 +115,7 @@ class ECHO_basis:
         
     def getTitle(self):
 	"""title"""
+	return self.decode(self.title)
 	try:
 		return self.title.encode('utf-8','ignore') 
 	except:
@@ -103,6 +124,8 @@ class ECHO_basis:
 	
     def getLabel(self):
 	"""title"""
+
+	return self.decode(self.label)
 	try:
 		return self.label.encode('utf-8','ignore') 
 	except:
@@ -383,47 +406,69 @@ 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:
 
-                    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 +505,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')
@@ -659,7 +702,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)
@@ -803,7 +846,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"""