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

version 1.9, 2005/04/06 09:18:41 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,label,description,content_type,responsible,weight,thumb="",streamingfile="",rawfile="",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 151  class OSAS_add_contextData(Folder): Line 151  class OSAS_add_contextData(Folder):
         """Hinzufuegen der Ressource"""          """Hinzufuegen der Ressource"""
     gifPath=path.replace("/mpiwg/online/","")      gifPath=path.replace("/mpiwg/online/","")
     rawPath=path.replace("/mpiwg/online/permanent/einstein_exhibition/movies/","")      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          thumbUrl="http://einst3.mpiwg-berlin.mpg.de/"+gifPath+"/"+thumb
         link="rtsp://einst1.mpiwg-berlin.mpg.de/"+gifPath+"/"+streamingfile          link="rtsp://einst1.mpiwg-berlin.mpg.de/"+gifPath+"/"+streamingfile
         rawFile="file:///Volumes/einstein_movies/"+rawPath+"/"+rawfile          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})
Line 161  class OSAS_add_contextData(Folder): Line 163  class OSAS_add_contextData(Folder):
                                   
         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
Removed from v.1.9  
changed lines
  Added in v.1.10

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