--- OSA_system2/OSAS_root.py 2005/03/07 21:25:41 1.7 +++ OSA_system2/OSAS_root.py 2005/03/17 19:26:52 1.8 @@ -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="",credits=None): """Hinzufuegen der Resource""" splitted=path.split("/") #print "BLU" @@ -158,7 +158,7 @@ class OSAS_add_contextData(Folder): 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) @@ -178,7 +178,7 @@ class OSAS_add_contextData(Folder): #print "label" urllib.urlopen(collection+"/"+id+"/generate_title").read() #print "title" - return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path) + return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'/browse?path='+path) manage_options = Folder.manage_options+( {'label':'Main Config','action':'add_contextData_config'}, @@ -307,7 +307,7 @@ class OSAS_root(Folder,Implicit): server=xmlrpclib.Server(self.serverUrl) name="/mpiwg/online/permanent/einstein_exhibition/movies/"+name - print "bl",name,os.path.splitext(name)[0]+".gif" + ret=server.generateMovieThumb(name,os.path.splitext(name)[0]+".gif") return ret