[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.51 and 1.52

version 1.51, 2007/01/31 14:28:04 version 1.52, 2008/10/17 06:26:43
Line 21  from xml.sax import make_parser Line 21  from xml.sax import make_parser
 from xml.sax.handler import ContentHandler  from xml.sax.handler import ContentHandler
 import sys  import sys
 import logging  import logging
   import xmlrpclib
 #ersetzt logging  #ersetzt logging
 def logger(txt,method,txt2):  def logger(txt,method,txt2):
     """logging"""      """logging"""
Line 382  class OSAS_add_contextData(Folder): Line 382  class OSAS_add_contextData(Folder):
   
         params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})          params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
   
           server=xmlrpclib.ServerProxy(collection,allow_none=True)   
         try:          try:
             retStr=urllib.urlopen(collection+"/addResource",params).read()              #retStr=urllib.urlopen(collection+"/addResource",params).read()
               
               retStr=server.addResource(id,title,label,description,content_type,responsible,link,metalink,weight,credits)
                 
         except:          except:
             return "An Error occured adding the resource\n", collection,params              return "An Error occured adding the resource A\n", collection,params,str(sys.exc_info()[0]),str(sys.exc_info()[1])
                   
         #print "added"          #print "added"
           logging.debug("Add an resource:"+repr(retStr))
         if not retStr:          if not retStr:
             return "An Error occured adding the resource\n", collection,params              return "An Error occured adding the resource B\n", collection,params
                   
         #print collection+"/"+id+"/copyIndex_meta2echo_resource"          #print collection+"/"+id+"/copyIndex_meta2echo_resource"
         #TODO: fehler falls generate label oder title nicht funktioniert abfangen, bei ECHO geht das z.B. manchmal nicht.          #TODO: fehler falls generate label oder title nicht funktioniert abfangen, bei ECHO geht das z.B. manchmal nicht.
         urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()          #server=xmlrpclib.ServerProxy(collection+"/"+id,allow_none=True)
           #server2=getattr(server,id)
           #server2.copyIndex_meta2echo_resource()
           #urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
         #print "copy2res"          #print "copy2res"
     try:      #try:
             urllib.urlopen(collection+"/"+id+"/generate_label").read()              #urllib.urlopen(collection+"/"+id+"/generate_label").read()
         except:     #         server2.generate_label()
         logger("OSAS_addfiles (addContextData2,label not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])        #  except:
     try:      #        logger("OSAS_addfiles (addContextData2,label not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
             urllib.urlopen(collection+"/"+id+"/generate_title").read()      #try:
     except:              #urllib.urlopen(collection+"/"+id+"/generate_title").read()
         logger("OSAS_addfiles (addContextData2,title not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])     #         server2.generate_title()
       #except:
       #    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.51  
changed lines
  Added in v.1.52

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