[BACK]Return to ZSQLUpdate.py CVS log [TXT] [DIR] Up to [Repository] / ZSQLExtend

Diff for /ZSQLExtend/ZSQLUpdate.py between versions 1.1 and 1.3

version 1.1, 2005/01/23 15:22:04 version 1.3, 2007/01/31 14:32:52
Line 1 Line 1
 from OFS.Folder import Folder  from OFS.Folder import Folder
 from Globals import DTMLFile,package_home  from Globals import DTMLFile,package_home
 from tempfile import NamedTemporaryFile  from tempfile import mkstemp
 from AccessControl import getSecurityManager  from AccessControl import getSecurityManager
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 import urllib  import urllib
 import os.path  import os.path
 import zLOG  
   
   import logging
   
   #ersetzt logging
   def logger(txt,method,txt2):
       """logging"""
       logging.info(txt+ txt2)
   
   
   
Line 24  class ZSQLUpdate(Folder): Line 31  class ZSQLUpdate(Folder):
   
   
                   
         tmpFile=NamedTemporaryFile()          tmphandler,path =mkstemp()
           tmpFile=os.fdopen(tmphandler,"w+b")
   
         if xmlurl:          if xmlurl:
             xmlf=urllib.urlopen(xmlurl).read()              xmlf=urllib.urlopen(xmlurl).read()
Line 34  class ZSQLUpdate(Folder): Line 42  class ZSQLUpdate(Folder):
             except:              except:
                 xmlf=getattr(self,xmlobject).data                  xmlf=getattr(self,xmlobject).data
                   
           
         tmpFile.write(xmlf)          tmpFile.write(xmlf)
         path=tmpFile.name          tmpFile.close()
   
           #path=tmpFile.name
   
         fmJarPath=os.path.join(package_home(globals()), 'fm.jar')          fmJarPath=os.path.join(package_home(globals()), 'fm.jar')
   
         zLOG.LOG("MPIWG Web",zLOG.INFO,"java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,path))          
           
           logger("MPIWG Web",logging.INFO,"java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,path))
         ret=os.popen("java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,path),"r").read()          ret=os.popen("java -classpath %s -Djava.awt.headless=true Convert %s"%(fmJarPath,path),"r").read()
     zLOG.LOG("MPIWG Web",zLOG.INFO,"result convert: %s"%ret)      logger("MPIWG Web",logging.INFO,"result convert: %s"%ret)
   
         tmpFile.close()          os.unlink(path)
         return "<html><body><h1>SQL update</h1><p>(notice, everything worked fine if only <q>java.lang.ClassNotFoundException: sun.jdbc.odbc.JdbcOdbcDriver</q> comes out as result)</p><p>Result:<br>%s</p></html></body>"%ret          return "<html><body><h1>SQL update</h1><p>(notice, everything worked fine if only <q>java.lang.ClassNotFoundException: sun.jdbc.odbc.JdbcOdbcDriver</q> comes out as result)</p><p>Result:<br>%s</p></html></body>"%ret
   
     def findUpdater(self):      def findUpdater(self):
Removed from v.1.1  
changed lines
  Added in v.1.3

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