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

Diff for /ECHO_content/ECHO_resource.py between versions 1.1 and 1.3

version 1.1, 2008/12/04 21:27:00 version 1.3, 2009/04/14 16:31:27
Line 23  from Globals import Persistent, package_ Line 23  from Globals import Persistent, package_
 from Acquisition import Implicit  from Acquisition import Implicit
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware  from Products.ZCatalog.CatalogPathAwareness import CatalogAware
 from Products.ZCTextIndex.ZCTextIndex import manage_addLexicon  from Products.ZCTextIndex.ZCTextIndex import manage_addLexicon
   try:
 from Products.MetaDataProvider.MetaDataClient import MetaDataClient  from Products.MetaDataProvider.MetaDataClient import MetaDataClient
   except:
       print "no metadata services"
 import urllib  import urllib
 import urllib2  import urllib2
 import cgi  import cgi
Line 201  class ECHO_resource(CatalogAware,Folder, Line 204  class ECHO_resource(CatalogAware,Folder,
   
     def getRDF(self,urn=None):      def getRDF(self,urn=None):
             """rdf"""              """rdf"""
             ret=getRDFDescription(self,self.link,urn=urn)              ap = self.getArchivePathFromMetadata()
            
          
               ret=getRDFDescription(self,self.link,urn=urn,ap=ap)
               logging.debug("ret:"+repr(ret))
             return ret+self.createSubElementRDF(urn=urn)               return ret+self.createSubElementRDF(urn=urn) 
   
       
Line 645  class ECHO_resource(CatalogAware,Folder, Line 652  class ECHO_resource(CatalogAware,Folder,
             """gibt pfad zum image aus"""              """gibt pfad zum image aus"""
             return self.getImageView(noredirect="yes",onlyPath="yes")              return self.getImageView(noredirect="yes",onlyPath="yes")
           
       def getArchivePathFromMetadata(self):
           try:
               fh=ECHO_helpers.urlopen(self.metalink)
               dom=xml.dom.minidom.parse(fh)
               archivePath=dom.getElementsByTagName('archive-path')
               text = getText(archivePath[0].childNodes)
               return text
           except:
               return ""
       
     def getImageView(self,noredirect=None,onlyPath=None):      def getImageView(self,noredirect=None,onlyPath=None):
             """getImages; give Imageviewr  and <error></error> if somthing goes wrong."""              """getImages; give Imageviewr  and <error></error> if somthing goes wrong."""
             try:              try:
Removed from v.1.1  
changed lines
  Added in v.1.3

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