--- ImageArchive/ImageArchive.py 2004/11/18 16:34:36 1.38 +++ ImageArchive/ImageArchive.py 2004/11/23 17:48:38 1.39 @@ -537,7 +537,7 @@ class ImageCollection(Folder, Persistent url=urllib.unquote(url) xmldoc=urllib.urlopen(url).read() - #print url + #return xmldoc try: dom=xml.dom.minidom.parseString(xmldoc) except: @@ -548,7 +548,9 @@ class ImageCollection(Folder, Persistent fnIds={} for image in images: imagename=image.getElementsByTagName('imagename')[0] - text=getText(imagename.childNodes) + + + idnr=image.getElementsByTagName('idnr')[0] id=getText(idnr.childNodes) numberOfPages=image.getElementsByTagName('numberOfPages')[0] @@ -557,13 +559,16 @@ class ImageCollection(Folder, Persistent nop=int(nopT) except: nop=0 - if not text=="": + texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste + for text in texts: + if not text=="": try: rc.append((str(text),id,nop)) fnIds[str(text)]=(id,nop) except: rc.append((repr(text),id,nop)) fnIds[repr(text)]=(id,nop) + rc.sort() self.REQUEST.SESSION['filenames']=rc