[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.46 and 1.53

version 1.46, 2006/06/14 16:13:53 version 1.53, 2010/02/15 19:09:00
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
   import xmlrpclib
   #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 157  class OSAS_add_Document(Folder): Line 164  class OSAS_add_Document(Folder):
         return OSAS_add.addPdf2(self)          return OSAS_add.addPdf2(self)
   
     def addImages(self,path):      def addImages(self,path):
         """Hinzufügen eines neuen Imagesfolders"""          """Hinzufuegen eines neuen Imagesfolders"""
         return OSAS_add.addImages(self,path)          return OSAS_add.addImages(self,path)
   
     def addImages2(self):      def addImages2(self):
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!"
   
         links=[(path,'storage server view')]          # old version for foxridge storage viewer
         # libcoll viewer with imagepath: needs pageimg directory          #links=[(path,'storage server view')]
         links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=imagepath&url=%s/pageimg'%path,'libcoll standard viewer (pageimg)')]  
         # libcoll viewer with imagepath: needs pageimg directory          # libcoll viewer with imagepath: needs pageimg directory
         links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=texttool&url=%s'%path,'libcoll standard viewer (texttool)')]          links=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=imagepath&url=%s/pageimg'%path,'libcoll standard viewer (pageimg)')]
           # libcoll viewer with texttool: needs texttool tag
           links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=texttool&url=%s/index.meta'%path,'libcoll standard viewer (texttool)')]
                                   
         links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link          links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link
         #print "LINK",links          #print "LINK",links
Line 374  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()
         zLOG.LOG("OSAS_addfiles (addContextData2,label not generated)", zLOG.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()
         zLOG.LOG("OSAS_addfiles (addContextData2,title not generated)", zLOG.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)
Line 435  def manage_AddOSAS_add_contextData(self, Line 452  def manage_AddOSAS_add_contextData(self,
 InitializeClass(OSAS_add_contextData)  InitializeClass(OSAS_add_contextData)
   
 class OSAS_add_Presentation(Folder):  class OSAS_add_Presentation(Folder):
     """Hinzufügen der Presentationsinformationen"""      """Hinzufuegen der Presentationsinformationen"""
     security=ClassSecurityInfo()      security=ClassSecurityInfo()
   
     def __init__(self,id):      def __init__(self,id):
Line 464  class OSAS_add_Presentation(Folder): Line 481  class OSAS_add_Presentation(Folder):
             RESPONSE.redirect('manage_main')              RESPONSE.redirect('manage_main')
   
     def addPresentation(self,path):      def addPresentation(self,path):
         """Hinzufügen der Presenationsinformation"""          """Hinzufuegen der Presenationsinformation"""
         return OSAS_add.addPresentation(self,path)          return OSAS_add.addPresentation(self,path)
   
     def addPresentation2(self):      def addPresentation2(self):
Line 487  def manage_AddOSAS_add_Presentation(self Line 504  def manage_AddOSAS_add_Presentation(self
 InitializeClass(OSAS_add_Presentation)  InitializeClass(OSAS_add_Presentation)
   
 class OSAS_combineTextImage(Folder):  class OSAS_combineTextImage(Folder):
     """Hinzufüge der Combine Text und Image"""      """Hinzufuege der Combine Text und Image"""
     security=ClassSecurityInfo()      security=ClassSecurityInfo()
   
     def __init__(self,id):      def __init__(self,id):
Line 517  class OSAS_combineTextImage(Folder): Line 534  class OSAS_combineTextImage(Folder):
                           
     security.declarePublic('combineTextImage')      security.declarePublic('combineTextImage')
     def combineTextImage(self,path):      def combineTextImage(self,path):
         """Hinzufügen der Presenationsinformation"""          """Hinzufuegen der Presenationsinformation"""
         """gibt input formular zur erstellung des texttools meta tag aus"""          """gibt input formular zur erstellung des texttools meta tag aus"""
         files = os.listdir(path)          files = os.listdir(path)
                   
Line 619  class OSAS_combineTextImage(Folder): Line 636  class OSAS_combineTextImage(Folder):
         return pt()          return pt()
   
     def isSelectedViewerTemplateSet(self,obj,id):      def isSelectedViewerTemplateSet(self,obj,id):
         """is ausgewählt"""          """is ausgewaehlt"""
                   
         if self.REQUEST['viewerTemplateSet']==id:          if self.REQUEST['viewerTemplateSet']==id:
             return 1              return 1
Removed from v.1.46  
changed lines
  Added in v.1.53

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