--- ECHO_content/ECHO_movie.py	2005/03/07 21:25:09	1.2
+++ ECHO_content/ECHO_movie.py	2005/03/22 20:31:26	1.4
@@ -54,7 +54,8 @@ class ECHO_movie(Folder,Persistent,ECHO_
     """ECHO Ressource"""
     security=ClassSecurityInfo()
     meta_type='ECHO_movie'
-
+    contentType='movie'
+    
 #    viewClassificationList=viewClassificationListMaster
 
     getSubCols = ECHO_helpers.getSubCols
@@ -67,11 +68,29 @@ class ECHO_movie(Folder,Persistent,ECHO_
   
 
     def getRDF(self,urn=None):
+	    
 	    """rdf"""
-	    ret=getRDFDescription(self,self.link,urn=urn)
-	    return ret+self.createSubElementRDF(urn=urn) 
-
-  
+	    #ret=getRDFDescription(self,self.link,urn=urn)
+	    #return ret+self.createSubElementRDF(urn=urn) 
+	    if not urn:
+		    urn=self.absolute_url()
+	    ret=""
+
+	    rettemp="""<RDF:Seq RDF:about="%s">\n"""%urn
+	    
+	    li="""<RDF:li RDF:resource="%s" />\n"""
+	    rettemp+=li%self.thumbUrl
+	    rettemp+=li%self.metalink
+	    rettemp+=li%self.rawFile
+	    rettemp+=li%self.link
+	    rettemp+="</RDF:Seq>"
+
+	    rettemp+=getRDFDescription(self,self.thumbUrl,nameDef="thumb",typeName="thumbnail",urn=self.thumbUrl)
+	    rettemp+=getRDFDescription(self,self.metalink,nameDef="metadata",typeName="ECHO_metaData",urn=self.metalink)
+	    rettemp+=getRDFDescription(self,self.rawFile,nameDef="raw",typeName="ECHO_dv_movie",urn=self.rawFile)
+	    rettemp+=getRDFDescription(self,self.link,nameDef="streaming internal",typeName="ECHO_streaming",urn=self.link)
+	    return rettemp
+    
     def getAccessRightSelectorHTML(self,outlook="select"):
 	    """htmlselector"""
 	    values=['free','mpiwg']
@@ -771,21 +790,24 @@ class ECHO_movie(Folder,Persistent,ECHO_
 
     def generate_label(self):
         """Erzeugt_standard_Label aus Template"""
-        pt=getattr(self,"label_template_"+self.contentType.lower())
-
-	self.label=pt()[0:]
-        return pt()
+	try:
+		pt=getattr(self,"label_template_"+self.contentType.lower())
+		self.label=pt()[0:]
+		return pt()
+	except:
+		return self.label
 
     security.declarePublic('generate_title') # has to be change, presentlyset because of OSAS koordination
 
     def generate_title(self,RESPONSE=None):
         """Erzeugt_standard_Label aus Template"""
-        pt=getattr(self,"label_template_"+self.contentType.lower())
-
-	self.title=pt()[0:]
+	try:
+		pt=getattr(self,"label_template_"+self.contentType.lower())
+		self.title=pt()[0:]
+		return pt()
+	except:
+		return self.label
 	
-        return pt()
-
 Globals.InitializeClass(ECHO_movie)
 
 def manage_addECHO_movieForm(self):