--- OSA_system2/OSAS_root.py	2005/03/07 19:33:42	1.6
+++ OSA_system2/OSAS_root.py	2005/10/10 18:11:11	1.12
@@ -86,9 +86,9 @@ class OSAS_add_contextData(Folder):
 
         except:
             zLOG.LOG('OSAS_Root (addFileToDollection)',zLOG.ERROR,'%s %s'%sys.exc_info()[:2])
-	    return URL
+            return URL
             return urllib.urlopen(URL).read()
-	    
+            
       
     def __init__(self,id,collection):
         self.id=id
@@ -109,15 +109,15 @@ class OSAS_add_contextData(Folder):
 
 
         URL+="/getPartnersXML"
-        parser=make_parser()	
-	curHandler=requestHandler()
+        parser=make_parser()    
+        curHandler=requestHandler()
         parser.setContentHandler(curHandler)
-	parser.parse(urllib.urlopen(URL))	        
-        try:	
+        parser.parse(urllib.urlopen(URL))               
+        try:    
                   
-	        return curHandler.ret
+                return curHandler.ret
         except:
-        	return [("",URL)]
+                return [("",URL)]
 
     
     
@@ -139,7 +139,7 @@ class OSAS_add_contextData(Folder):
     
     index_html=addContextData
     
-    def addContextData2(self,path,collection,thumb,streamingfile,rawfile,label,description,content_type,responsible,weight,credits=None):
+    def addContextData2(self,path,collection,label,description,content_type,responsible,weight,thumb="",streamingfile="",rawfile="",lowresfile="",credits=None):
         """Hinzufuegen der Resource"""
         splitted=path.split("/")
         #print "BLU"
@@ -150,34 +150,39 @@ class OSAS_add_contextData(Folder):
         #link=TOBEDONE"
         """Hinzufuegen der Ressource"""
 
-        thumbUrl="http://einst3.mpiwg-berlin.mpg.de/"+path+thumb
-        link="rtsp://einst1.mpiwg-berlin.mpg.de/"+path+streamingfile
-        rawFile="file:///Volumes/einstein_movies/"+path+rawfile
+        gifPath=path.replace("/mpiwg/online/","")
+        rawPath=path.replace("/mpiwg/online/permanent/einstein_exhibition/movies/","")
+        lowresPath=path.replace("/mpiwg/online/permanent/einstein_exhibition/movies/","")
+
+        thumbUrl="http://einst3.mpiwg-berlin.mpg.de/"+gifPath+"/"+thumb
+        link="rtsp://einst1.mpiwg-berlin.mpg.de/"+gifPath+"/"+streamingfile
+        rawFile="file:///Volumes/einstein_movies/"+rawPath+"/"+rawfile
+        lowresFile="rtsp://einst1.mpiwg-berlin.mpg.de/"+gifPath+"/"+lowresfile
 
         
         params=urllib.urlencode({'id':id,'title':title,'link':link,'thumbUrl':thumbUrl,'rawFile':rawFile,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
 
-        #retStr=urllib.urlopen(collection+"/addMovie",params).read()
+                
         try:
             server=xmlrpclib.Server(collection,allow_none=True)
-            retStr=server.addMovie(id,title,label,description,content_type,responsible,link,thumbUrl,rawFile,metalink,weight,credits)
+            retStr=server.addMovie(id,title,label,description,content_type,responsible,link,thumbUrl,rawFile,lowresFile,metalink,weight,credits)
         except:
             zLOG.LOG('OSAS_Root (addFileToDollection2)',zLOG.ERROR,'%s %s'%sys.exc_info()[:2])
             return "An Error occured adding the resource\n", collection,params
         
-	#print "added"
-	if not retStr:
+        #print "added"
+        if not retStr:
             return "An Error occured adding the resource\n", collection,params
-	
+        
         #print collection+"/"+id+"/copyIndex_meta2echo_resource"
 
         urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
-	#print "copy2res"
+        #print "copy2res"
         urllib.urlopen(collection+"/"+id+"/generate_label").read()
-	#print "label"
+        #print "label"
         urllib.urlopen(collection+"/"+id+"/generate_title").read()
-	#print "title"
-        return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
+        #print "title"
+        return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'/browse?path='+path)
         
     manage_options = Folder.manage_options+(
             {'label':'Main Config','action':'add_contextData_config'},
@@ -301,11 +306,20 @@ class OSAS_root(Folder,Implicit):
 
     OSASObjectTypes=OSAS_helpers.OSASObjectTypes
 
+    def extendDict(self,dict1,dict2):
+        """add two dicts"""
+        ret=dict1
+        for name in dict2.keys():
+            ret[name]=dict2[name]
+        return ret
+    
+        
     def generateMovieThumb(self,name):
         """generate movie"""
         server=xmlrpclib.Server(self.serverUrl)
-        name="/mpiwg/online"+name
-        print "bl",name,os.path.splitext(name)[0]+".gif"
+        name="/mpiwg/online/permanent/einstein_exhibition/movies/"+name
+
+        
         ret=server.generateMovieThumb(name,os.path.splitext(name)[0]+".gif")
         return ret