[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.6 and 1.10

version 1.6, 2005/03/07 19:33:42 version 1.10, 2005/04/13 16:29:54
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="",lowresfile="",credits=None):
         """Hinzufuegen der Resource"""          """Hinzufuegen der Resource"""
         splitted=path.split("/")          splitted=path.split("/")
         #print "BLU"          #print "BLU"
Line 149  class OSAS_add_contextData(Folder): Line 149  class OSAS_add_contextData(Folder):
                   
         #link=TOBEDONE"          #link=TOBEDONE"
         """Hinzufuegen der Ressource"""          """Hinzufuegen der Ressource"""
       gifPath=path.replace("/mpiwg/online/","")
         thumbUrl="http://einst3.mpiwg-berlin.mpg.de/"+path+thumb      rawPath=path.replace("/mpiwg/online/permanent/einstein_exhibition/movies/","")
         link="rtsp://einst1.mpiwg-berlin.mpg.de/"+path+streamingfile          lowresPath=path.replace("/mpiwg/online/permanent/einstein_exhibition/movies/","")
         rawFile="file:///Volumes/einstein_movies/"+path+rawfile          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="file:///Volumes/einstein_movies/"+lowresPath+"/"+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})          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,lowresFile,metalink,weight,credits)
         except:          except:
             zLOG.LOG('OSAS_Root (addFileToDollection2)',zLOG.ERROR,'%s %s'%sys.exc_info()[:2])              zLOG.LOG('OSAS_Root (addFileToDollection2)',zLOG.ERROR,'%s %s'%sys.exc_info()[:2])
             return "An Error occured adding the resource\n", collection,params              return "An Error occured adding the resource\n", collection,params
Line 177  class OSAS_add_contextData(Folder): Line 180  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 301  class OSAS_root(Folder,Implicit): Line 304  class OSAS_root(Folder,Implicit):
   
     OSASObjectTypes=OSAS_helpers.OSASObjectTypes      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):      def generateMovieThumb(self,name):
         """generate movie"""          """generate movie"""
         server=xmlrpclib.Server(self.serverUrl)          server=xmlrpclib.Server(self.serverUrl)
         name="/mpiwg/online"+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.6  
changed lines
  Added in v.1.10

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