Diff for /OSAS/OSA_system/OSAS_Root.py between versions 1.13 and 1.22

version 1.13, 2004/07/01 07:46:42 version 1.22, 2007/01/31 14:28:04
Line 5  from OFS.Folder import Folder Line 5  from OFS.Folder import Folder
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate  from Products.PageTemplates.PageTemplate import PageTemplate
 import urllib  import urllib
   import urlparse
   import sys
   import logging
   
   #ersetzt logging
   def logger(txt,method,txt2):
       """logging"""
       logging.info(txt+ txt2)
   
   
 import re  import re
 import xml.dom.minidom  import xml.dom.minidom
   import os.path
   from Globals import package_home
   
 class OSAS_ViewerObject(Folder):  class OSAS_ViewerObject(Folder):
     """Beschreibung eines Viewers"""      """Beschreibung eines Viewers"""
Line 24  class OSAS_ViewerObject(Folder): Line 36  class OSAS_ViewerObject(Folder):
   
     def changeViewerObjectForm(self):      def changeViewerObjectForm(self):
         """Main configuration"""          """Main configuration"""
         pt=PageTemplateFile('Products/OSA_system/zpt/changeViewerObjectForm.zpt').__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeViewerObjectForm.zpt')).__of__(self)
         return pt()          return pt()
   
     def changeViewerObject(self,title,prefix):      def changeViewerObject(self,title,prefix,RESPONSE=None):
         """Change RootFolderName"""          """Change RootFolderName"""
         self.title=title          self.title=title
         self.prefix=prefix          self.prefix=prefix
Line 39  class OSAS_ViewerObject(Folder): Line 51  class OSAS_ViewerObject(Folder):
   
 def manage_AddOSAS_ViewerObjectForm(self):  def manage_AddOSAS_ViewerObjectForm(self):
     """interface for adding the viewer Object"""      """interface for adding the viewer Object"""
     pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_ViewerObject.zpt').__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_ViewerObject.zpt')).__of__(self)
     return pt()      return pt()
   
 def manage_AddOSAS_ViewerObject(self,id,title,prefix,RESPONSE=None):  def manage_AddOSAS_ViewerObject(self,id,title,prefix,RESPONSE=None):
Line 73  class OSAS_Root(Folder,Implicit): Line 85  class OSAS_Root(Folder,Implicit):
                   
     def Root_config(self):      def Root_config(self):
         """Main configuration"""          """Main configuration"""
         pt=PageTemplateFile('Products/OSA_system/zpt/ConfigOSAS_Root.zpt').__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ConfigOSAS_Root.zpt')).__of__(self)
         return pt()          return pt()
   
     def change_OSAS_Root(self,RootFolderName,DigILibURL,uploadServletUrl,RESPONSE=None):      def change_OSAS_Root(self,RootFolderName,DigILibURL,uploadServletUrl,RESPONSE=None):
Line 98  class OSAS_Root(Folder,Implicit): Line 110  class OSAS_Root(Folder,Implicit):
   
     def downloadExternalXML(self,index_meta_url,xml_url):      def downloadExternalXML(self,index_meta_url,xml_url):
         """lade xml file"""          """lade xml file"""
           #print "GI"
           #print xml_url
       try:
         xmlneu=urllib.urlopen(xml_url).read()          xmlneu=urllib.urlopen(xml_url).read()
       except:
                   logger("OSASRoot (downloadExternalXML)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
                   logger("OSASRoot (downloadExternalXML)", logging.INFO,xml_url)
           return "error"
         try:          try:
             dom=xml.dom.minidom.parseString(xmlneu)              dom=xml.dom.minidom.parseString(xmlneu)
         except:          except:
             print "Error"              print "Error"
             print xmlneu              return repr(xml_url)
             return "error"              return "error"
   
         path=re.sub(self.REQUEST['SERVER_URL'],'',index_meta_url)  
         path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',index_meta_url)  
   
         path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server  
         path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server  
         path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server  
   
       #TODO: direct access to the file system necessary, fix that also xmlrpc to the server where the index file is stored is possible    
       parsedUrl=urlparse.urlparse(index_meta_url)
       path=parsedUrl[2]
   
         fh=open(path,'w')          fh=open(path,'w')
       logger("OSAS",logging.INFO,path)
         fh.write(xmlneu)          fh.write(xmlneu)
         fh.close()          fh.close()
         return "ok"          return "ok"
Line 125  class OSAS_Root(Folder,Implicit): Line 139  class OSAS_Root(Folder,Implicit):
                   
 def manage_AddOSAS_RootForm(self):  def manage_AddOSAS_RootForm(self):
     """interface for adding the OSAS_root"""      """interface for adding the OSAS_root"""
     pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_Root.zpt').__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_Root.zpt')).__of__(self)
     return pt()      return pt()
   
 def manage_AddOSAS_Root(self,id,RootFolderName,DigILibURL,uploadServletUrl,RESPONSE=None):  def manage_AddOSAS_Root(self,id,RootFolderName,DigILibURL,uploadServletUrl,RESPONSE=None):

Removed from v.1.13  
changed lines
  Added in v.1.22


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