--- ImageArchive/ImageArchive.py 2006/05/17 19:43:45 1.85 +++ ImageArchive/ImageArchive.py 2006/05/17 20:18:38 1.86 @@ -1631,7 +1631,7 @@ class ImageCollection(OrderedFolder, Per def getImageByName(self,filename,onlyName=None): """get filename""" - print repr(filename) + #FIXME: umlaute in filename fn=getattr(self,repr(filename),None) if not fn: @@ -1874,7 +1874,7 @@ class ImageCollectionMD(ImageCollection, urlTmp=REQUEST['URL1'] url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING'] - + if xml is None: RESPONSE.redirect('xmlinput?url='+urllib.quote(url)) else: @@ -2064,9 +2064,10 @@ class ImageCollectionMD(ImageCollection, rc=[] fnIds={} for image in images: + imagename=image.getElementsByTagName('imagename')[0] - - + + idnr=image.getElementsByTagName('idnr')[0] @@ -2087,6 +2088,7 @@ class ImageCollectionMD(ImageCollection, texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste for text in texts: + if not text=="": text=self.getImageByName(text,onlyName="yes") try: @@ -2098,9 +2100,10 @@ class ImageCollectionMD(ImageCollection, rc.sort() + self.REQUEST.SESSION['filenames']=rc self.REQUEST.SESSION['filenamesIds']=fnIds - + overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html']) if overview: