[BACK]Return to OSAS_root.py CVS log [TXT] [DIR] Up to [Repository] / OSA_system2

Diff for /OSA_system2/OSAS_root.py between versions 1.7 and 1.8

version 1.7, 2005/03/07 21:25:41 version 1.8, 2005/03/17 19:26:52
Line 139  class OSAS_add_contextData(Folder): Line 139  class OSAS_add_contextData(Folder):
           
     index_html=addContextData      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"""          """Hinzufuegen der Resource"""
         splitted=path.split("/")          splitted=path.split("/")
         #print "BLU"          #print "BLU"
Line 158  class OSAS_add_contextData(Folder): Line 158  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})          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:          try:
             server=xmlrpclib.Server(collection,allow_none=True)              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,metalink,weight,credits)
Line 178  class OSAS_add_contextData(Folder): Line 178  class OSAS_add_contextData(Folder):
     #print "label"      #print "label"
         urllib.urlopen(collection+"/"+id+"/generate_title").read()          urllib.urlopen(collection+"/"+id+"/generate_title").read()
     #print "title"      #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+(      manage_options = Folder.manage_options+(
             {'label':'Main Config','action':'add_contextData_config'},              {'label':'Main Config','action':'add_contextData_config'},
Line 307  class OSAS_root(Folder,Implicit): Line 307  class OSAS_root(Folder,Implicit):
         server=xmlrpclib.Server(self.serverUrl)          server=xmlrpclib.Server(self.serverUrl)
         name="/mpiwg/online/permanent/einstein_exhibition/movies/"+name          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")          ret=server.generateMovieThumb(name,os.path.splitext(name)[0]+".gif")
         return ret          return ret
           
Removed from v.1.7  
changed lines
  Added in v.1.8

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>