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