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

Diff for /ImageArchive/ImageArchive.py between versions 1.97 and 1.98

version 1.97, 2006/07/20 10:41:40 version 1.98, 2006/07/24 17:31:06
Line 53  tdir="tmp" Line 53  tdir="tmp"
 #tdir = "/mpiwg/temp/tmp/archivesImageServer/"  #tdir = "/mpiwg/temp/tmp/archivesImageServer/"
 #tdir="/tmp/archivesImageServer/"  #tdir="/tmp/archivesImageServer/"
   
 imageExtensions=['jpg','jpeg','tif','tiff','png']  imageExtensions=['.jpg','.jpeg','.tif','.tiff','.png','.gif']
   
 def splitPath(str):  def splitPath(str):
         str2=str.replace("\\","/")          str2=str.replace("\\","/")
Line 793  class ImageCollection(OrderedFolder, Per Line 793  class ImageCollection(OrderedFolder, Per
                   
         name=os.path.splitext(name)[0]          name=os.path.splitext(name)[0]
         for extension in imageExtensions:          for extension in imageExtensions:
             nameExt=name+"."+extension              nameExt=name+extension
   
             if hasattr(self,nameExt):              if hasattr(self,nameExt):
                 return getattr(self,nameExt)                  return getattr(self,nameExt)
                           
             nameExt=name+"_."+extension              nameExt=name+"_"+extension
             if hasattr(self,nameExt):              if hasattr(self,nameExt):
                 return getattr(self,nameExt)                  return getattr(self,nameExt)
                   
Line 1788  class ImageCollection(OrderedFolder, Per Line 1788  class ImageCollection(OrderedFolder, Per
         #FIXME: umlaute in filename          #FIXME: umlaute in filename
         fn=getattr(self,repr(filename),None)          fn=getattr(self,repr(filename),None)
         if not fn:          if not fn:
   
           if os.path.splitext(filename)[1].lower() in imageExtensions:
             filenameM=os.path.splitext(filename)[0]              filenameM=os.path.splitext(filename)[0]
               else:                    
              filenameM=filename
   
   
                                                           
             founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])              founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])
   
   
             for found in founds:              for found in founds:
           if os.path.splitext(found[0])[1].lower() in imageExtensions:
                 foundM=os.path.splitext(found[0])[0]                  foundM=os.path.splitext(found[0])[0]
           else:   
               foundM=found[0]
   
                 if filenameM.lower()==foundM.lower():                  if filenameM.lower()==foundM.lower():
                     if onlyName:                      if onlyName:
Removed from v.1.97  
changed lines
  Added in v.1.98

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