[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.184 and 1.186

version 1.184, 2004/10/27 15:58:15 version 1.186, 2004/10/28 10:57:05
Line 1012  class ECHO_resource(Folder,Persistent): Line 1012  class ECHO_resource(Folder,Persistent):
         """create ImageUrl"""          """create ImageUrl"""
   
                   
         resourcepath=readFieldFromXML(self.metalink,'resource','archive-path').replace('/mpiwg/online','')          resourcepath=readFieldFromXML(self.metalink,'resource','archive-path')
                   
         digiliburlprefix=readFieldFromXML(self.metalink,'texttool','digiliburlprefix')          digiliburlprefix=readFieldFromXML(self.metalink,'texttool','digiliburlprefix')
         images=readFieldFromXML(self.metalink,'texttool','image')          images=readFieldFromXML(self.metalink,'texttool','image')
Line 1021  class ECHO_resource(Folder,Persistent): Line 1021  class ECHO_resource(Folder,Persistent):
         if (not resourcepath) or (not digiliburlprefix) or (not images):          if (not resourcepath) or (not digiliburlprefix) or (not images):
             zLOG.LOG("ECHO (createImageUrl)",zLOG.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())              zLOG.LOG("ECHO (createImageUrl)",zLOG.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())
             return None              return None
                   resourcepath=resourcepath.replace('/mpiwg/online','')
         if not digiliburlprefix: digiliburlprefix="http://echo.mpiwg-berlin.mpg.de/zogilib?"          if not digiliburlprefix: digiliburlprefix="http://echo.mpiwg-berlin.mpg.de/zogilib?"
   
         if (not images) or (not resourcepath): return None          if (not images) or (not resourcepath): return None
Line 3109  class ECHO_root(Folder,Persistent,Implic Line 3109  class ECHO_root(Folder,Persistent,Implic
     #return "http://enlil.museum.upenn.edu/cgi-bin/cdlget.plx?item=%s&project=ncdl"      #return "http://enlil.museum.upenn.edu/cgi-bin/cdlget.plx?item=%s&project=ncdl"
     ###END CDLI add      ###END CDLI add
   
   
       def checkResource(self,id):
           """checks if a resource is in the tree, gives back none or list of resources"""
           if hasattr(self,"_v_checkResource") and self._v_checkResource.has_key(id): #existiert ein cache und id ist bereits drin?
                   return self._v_checkResource[id]
   
           else:
               resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],obj_ids=[id],search_sub=1)
   
               if not hasattr(self,"_v_checkResource"): self._v_checkResource={}#lege cache an falls nicht existent
               if resources:
                   self._v_checkResource[id]=resources[0:] # slicing to be sure that data is stabil
               else:
                   self._v_checkResource[id]=None
               
               return self._v_checkResource[id]
           
     def sendForm(self,fromaddr,content,server='mail.mpiwg-berlin.mpg.de'):      def sendForm(self,fromaddr,content,server='mail.mpiwg-berlin.mpg.de'):
         """sendform"""          """sendform"""
         toaddrs=["dwinter@mpiwg-berlin.mpg.de"]          toaddrs=["dwinter@mpiwg-berlin.mpg.de"]
Removed from v.1.184  
changed lines
  Added in v.1.186

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