--- ImageArchive/ImageArchive.py	2004/11/18 16:34:36	1.38
+++ ImageArchive/ImageArchive.py	2004/11/24 17:03:23	1.40
@@ -18,8 +18,11 @@ try:
     from Products.ECHO_content.ECHO_collection import ECHO_basis
 except:
     print "ECHO Elements not imported"
-    ECHO_basis=None
-	
+    class ECHO_basis:
+        """leer"""
+        manage_options=()
+
+
 def splitPath(str):
 	str2=str.replace("\\","/")
 	return os.path.split(str2)[1]
@@ -218,10 +221,12 @@ def manage_AddImageDigilib(self,id,fileu
         RESPONSE.redirect('manage_main')
 
                  
-class ImageCollection(Folder, Persistent, Implicit, ECHO_basis):
+class ImageCollection(Folder, Persistent, Implicit,ECHO_basis):
     """Sammelordner für Bilder"""
     meta_type="ImageCollection"
 
+   
+    
     genericMetaDataType="leiden_meta"
 
     leiden_meta_fields=['image_id','date','country','place','people','description','photographer']
@@ -537,7 +542,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 +553,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 +564,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