[BACK]Return to OSAS_addfiles.py CVS log [TXT] [DIR] Up to [Repository] / OSAS / OSA_system

Diff for /OSAS/OSA_system/OSAS_addfiles.py between versions 1.50 and 1.51

version 1.50, 2006/06/15 15:50:03 version 1.51, 2007/01/31 14:28:04
Line 20  from Globals import package_home Line 20  from Globals import package_home
 from xml.sax import make_parser  from xml.sax import make_parser
 from xml.sax.handler import ContentHandler  from xml.sax.handler import ContentHandler
 import sys  import sys
 import zLOG  import logging
   
   #ersetzt logging
   def logger(txt,method,txt2):
       """logging"""
       logging.info(txt+ txt2)
   
   
   
 def spaces(depth):  def spaces(depth):
     """needed in XMLtoTree"""      """needed in XMLtoTree"""
Line 337  class OSAS_add_contextData(Folder): Line 344  class OSAS_add_contextData(Folder):
             urllib.urlopen(server+"/"+urlpath+"/index.meta")              urllib.urlopen(server+"/"+urlpath+"/index.meta")
                           
         except:          except:
             zLOG.LOG("OSAS_addfiles (addContextData)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])              logger("OSAS_addfiles (addContextData)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
             return server+"/"+urlpath+"/index.meta file has to exist!"              return server+"/"+urlpath+"/index.meta file has to exist!"
   
         # old version for foxridge storage viewer          # old version for foxridge storage viewer
Line 392  class OSAS_add_contextData(Folder): Line 399  class OSAS_add_contextData(Folder):
     try:      try:
             urllib.urlopen(collection+"/"+id+"/generate_label").read()              urllib.urlopen(collection+"/"+id+"/generate_label").read()
         except:          except:
         zLOG.LOG("OSAS_addfiles (addContextData2,label not generated)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])          logger("OSAS_addfiles (addContextData2,label not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
     try:      try:
             urllib.urlopen(collection+"/"+id+"/generate_title").read()              urllib.urlopen(collection+"/"+id+"/generate_title").read()
     except:      except:
         zLOG.LOG("OSAS_addfiles (addContextData2,title not generated)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])          logger("OSAS_addfiles (addContextData2,title not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
                           
   
         return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)          return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
Removed from v.1.50  
changed lines
  Added in v.1.51

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