[BACK]Return to ECHO_collection.py CVS log [TXT] [DIR] Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.74 and 1.75

version 1.74, 2004/05/10 13:23:59 version 1.75, 2004/05/10 13:51:03
Line 105  def sendFile(self, filename, type): Line 105  def sendFile(self, filename, type):
     object = self      object = self
     # look for an object called filename      # look for an object called filename
     for path in paths:      for path in paths:
       print "fragment: '"+path+"'"
         if hasattr(object, path):          if hasattr(object, path):
           print "  exists"
         object = getattr(object, path)          object = getattr(object, path)
     else:      else:
           print "  doesn't exist"
         object = None          object = None
         break          break
     if object:      if object:
     # if the object exists then send it      # if the object exists then send it
       print "send zope object"+object()
     object()      object()
     else:      else:
     # send a local file with the given content-type      # send a local file with the given content-type
     fn = os.path.join(package_home(globals()), filename)      fn = os.path.join(package_home(globals()), filename)
       print "send fs file: "+fn
     self.REQUEST.RESPONSE.setHeader("Content-Type", type)      self.REQUEST.RESPONSE.setHeader("Content-Type", type)
     self.REQUEST.RESPONSE.write(file(fn).read())      self.REQUEST.RESPONSE.write(file(fn).read())
     return      return
Line 539  class ECHO_resource(Folder): Line 544  class ECHO_resource(Folder):
     def changeECHO_resource_metadata(self,RESPONSE=None):      def changeECHO_resource_metadata(self,RESPONSE=None):
         """change metadata"""          """change metadata"""
         tags=self.findTagsFromMapping(self.contentType)          tags=self.findTagsFromMapping(self.contentType)
         OSAS_meta={}          self.OSAS_meta={}
         for field in tags[1]:          for field in tags[1]:
             try:              try:
                 self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]                  self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]
Line 547  class ECHO_resource(Folder): Line 552  class ECHO_resource(Folder):
             except:              except:
                 """nothing"""                  """nothing"""
   
         return urllib.urlopen('http://localhost:8080/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.absolute_url()+'/newMetaXML',self.metalink)).read()          return urllib.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read()
                   
         if RESPONSE is not None:          if RESPONSE is not None:
             RESPONSE.redirect('manage_main')              RESPONSE.redirect('manage_main')
   
   
     def newMetaXML(self):      def newMetaXML(self):
           """new index.meta"""
         self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')          self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
         return writeMetadata(self.metalink,self.OSAS_meta)          return writeMetadata(self.metalink,self.OSAS_meta)
   
Removed from v.1.74  
changed lines
  Added in v.1.75

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