--- ImageArchive/ImageArchive.py 2006/05/15 13:14:16 1.78 +++ ImageArchive/ImageArchive.py 2006/05/15 15:57:35 1.80 @@ -1626,14 +1626,28 @@ class ImageCollection(OrderedFolder, Per fn=getattr(self,repr(filename),None) if not fn: filenameM=filename.split(".")[0] + founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib']) + + for found in founds: foundM=found[0].split(".")[0] + if filenameM.lower()==foundM.lower(): if onlyName: return found[0] else: - return found[1] + return found[1] + #HACK teste noch ob am ende des filenames eventuell ein "_" und loesche das. + if foundM[-1]=="_": + foundM=foundM[0:-1] + + if filenameM.lower()==foundM.lower(): + if onlyName: + return found[0] + else: + return found[1] + if onlyName: return filename else: @@ -1831,7 +1845,7 @@ class ImageCollectionMD(ImageCollection, self.REQUEST.SESSION['filenames']=ret #self.REQUEST.SESSION['filenamesIds']=fnIds - overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html']) + overview=self.ZopeFind(self,obj_ids=['overview_selected.html']) if overview and (generic =='No'): @@ -1867,7 +1881,7 @@ class ImageCollectionMD(ImageCollection, if selection: #selection i.e. selection already stored at self.REQUEST.SESSION['filenames'] - overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html']) + overview=self.ZopeFind(self,obj_ids=['overview_selected.html']) if overview and (generic =='No'):# @@ -1881,7 +1895,7 @@ class ImageCollectionMD(ImageCollection, #no filename then show overview - overview=self.ZopeFind(self,obj_ids=['overviewMD.html']) + overview=self.ZopeFind(self,obj_ids=['overview.html']) if overview and (generic == 'No'): @@ -1900,6 +1914,9 @@ class ImageCollectionMD(ImageCollection, if not selected and self.REQUEST.has_key('fn'): imagename=self.REQUEST['fn'].split('/')[-1] + + imagename=self.getImageByName(imagename,onlyName=True) + nr=self.getObjectPosition(imagename) objects=self.objectIds() @@ -1914,6 +1931,9 @@ class ImageCollectionMD(ImageCollection, if not selected and self.REQUEST.has_key('fn'): imagename=self.REQUEST['fn'].split('/')[-1] + + imagename=self.getImageByName(imagename,onlyName=True) + nr=self.getObjectPosition(imagename) objects=self.objectIds()