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

version 1.2, 2005/01/23 16:26:52 version 1.3, 2007/01/31 14:32:52
Line 5  from AccessControl import getSecurityMan Line 5  from AccessControl import getSecurityMan
 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 45  class ZSQLUpdate(Folder): Line 52  class ZSQLUpdate(Folder):
                   
                   
                   
         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)
   
         os.unlink(path)          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

Removed from v.1.2  
changed lines
  Added in v.1.3


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