Diff for /OSA_system2/OSAS_server.py between versions 1.20 and 1.21

version 1.20, 2005/12/01 10:43:18 version 1.21, 2007/01/31 14:30:29
Line 8  import base64 Line 8  import base64
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Globals import InitializeClass,package_home  from Globals import InitializeClass,package_home
 from OFS.SimpleItem import SimpleItem  from OFS.SimpleItem import SimpleItem
 import zLOG  import logging
 import sys  import sys
   
   #ersetzt logging
   def logger(txt,method,txt2):
       """logging"""
       logging.info(txt+ txt2)
   
   
   
 def encodeRPC(string):  def encodeRPC(string):
     return base64.encodestring(bz2.compress(string))      return base64.encodestring(bz2.compress(string))
 def decodeRPC(string):  def decodeRPC(string):
Line 168  class OSAS_storeOnlineServer(SimpleItem) Line 175  class OSAS_storeOnlineServer(SimpleItem)
   
     def generateMovieThumb(self,input,output):      def generateMovieThumb(self,input,output):
         """generate Movie"""          """generate Movie"""
         zLOG.LOG("SERVER",zLOG.INFO,"/usr/local/bin/thumbbite.pl %s %s"%(input,output))           logger("SERVER",logging.INFO,"/usr/local/bin/thumbbite.pl %s %s"%(input,output)) 
         ret=os.popen("/usr/local/bin/thumbbite.pl %s %s"%(input,output))          ret=os.popen("/usr/local/bin/thumbbite.pl %s %s"%(input,output))
         zLOG.LOG("SERVER",zLOG.INFO,ret)                                  logger("SERVER",logging.INFO,ret)                        
         return "ok"          return "ok"
   
 def manage_addOSAS_storeOnlineServerForm(self):  def manage_addOSAS_storeOnlineServerForm(self):

Removed from v.1.20  
changed lines
  Added in v.1.21


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