--- ECHO_content/ECHO_movie.py	2005/03/17 19:27:34	1.3
+++ ECHO_content/ECHO_movie.py	2005/04/13 15:13:19	1.5
@@ -67,12 +67,59 @@ class ECHO_movie(Folder,Persistent,ECHO_
     security.declareProtected('View','createPDF')
   
 
+    def linkHTTP(self):
+	    """protokoll fuer link html"""
+	    
+	    splitted=self.link.split(":")
+	    if len(splitted)<2:
+		    return self.link
+	    else:
+		    splitted[0]="http"
+
+	    ret= ":".join(splitted)
+	    ret=ret.replace("//einst1","//einst3")
+	    return ret
+    
+    def linkRTSP(self):
+	    """protokoll fuer link html"""
+	    splitted=self.link.split(":")
+	    if len(splitted)<2:
+		    return self.link
+	    else:
+		    splitted[0]="RTSP"
+
+	    ret= ":".join(splitted)
+	    ret=ret.replace("//einst3","//einst1")
+	    return ret
+    
+
     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%getattr(self,'lowresFile','')
+	    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)
+	    if not (getattr(self,'lowresFile','')==""):
+		    rettemp+=getRDFDescription(self,self.lowresFile,nameDef="raw",typeName="ECHO_dv_movie",urn=self.lowresFile)
+	    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']
@@ -305,7 +352,7 @@ class ECHO_movie(Folder,Persistent,ECHO_
 
 
     
-    def __init__(self,id,link,thumbUrl,rawFile,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords):
+    def __init__(self,id,link,thumbUrl,rawFile,lowresFile,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords):
 
         self.id = id
         """Festlegen der ID"""
@@ -324,6 +371,7 @@ class ECHO_movie(Folder,Persistent,ECHO_
         self.resourceID=resourceID
         self.thumbUrl=thumbUrl
         self.rawFile=rawFile
+	self.lowresFile=lowresFile
 	
         if coords:
             coordsnew=[ string.split(x,",") for x in coords]
@@ -396,7 +444,7 @@ class ECHO_movie(Folder,Persistent,ECHO_
 
 
     
-    def changeECHO_movie_main(self,metalink,link,rawFile,thumbUrl,title,label,description,contentType,renderingType="",weight="",resourceID="",RESPONSE=None):
+    def changeECHO_movie_main(self,metalink,link,rawFile,lowresFile,thumbUrl,title,label,description,contentType,renderingType="",weight="",resourceID="",RESPONSE=None):
         """Aenderung der Properties"""
 	self.resourceID=resourceID
 	self.title=title
@@ -410,6 +458,7 @@ class ECHO_movie(Folder,Persistent,ECHO_
         self.link=link
         self.thumbUrl=thumbUrl
         self.rawFile=rawFile
+	self.lowresFile=lowresFile
        
         self.metalink=metalink
         
@@ -515,7 +564,7 @@ class ECHO_movie(Folder,Persistent,ECHO_
 	    self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
 	    return writeMetadata(self.metalink,self.metaDataHash)
 
-    def changeECHO_movie(self,metalink,link,thumbUrl,rawFile,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
+    def changeECHO_movie(self,metalink,link,thumbUrl,rawFile,lowresFile,title,label,description,contentType,responsible,weight,coords=None,credits=None,RESPONSE=None):
         """Aenderung der Properties"""
         
         setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight)
@@ -523,6 +572,7 @@ class ECHO_movie(Folder,Persistent,ECHO_
         self.metalink=metalink
         self.thumbUrl=thumbUrl
         self.rawFile=rawFile
+	self.lowresFile=lowresFile
         
         
         if RESPONSE is not None:
@@ -799,10 +849,10 @@ def manage_addECHO_movieForm(self):
 
 
 
-def manage_addECHO_movie(self,id,title,label,description="",responsible="",link="",thumbUrl="",rawFile="",metalink="",weight="",copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
+def manage_addECHO_movie(self,id,title,label,description="",responsible="",link="",thumbUrl="",rawFile="",lowresFile="",metalink="",weight="",copyrightType=None,resourceID=None,contentType=None,renderingType=None,credits=None,coords=None,RESPONSE=None):
     """addaresource"""
 
-    newObj=ECHO_movie(id,link,thumbUrl,rawFile,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
+    newObj=ECHO_movie(id,link,thumbUrl,rawFile,lowresFile,metalink,resourceID,title,label,description,contentType,renderingType,copyrightType,responsible,credits,weight,coords)
 
     self._setObject(id,newObj)