--- ImageArchive/ImageArchive.py	2006/05/17 15:41:22	1.83
+++ 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:
@@ -1919,13 +1919,13 @@ class ImageCollectionMD(ImageCollection,
 
         self.REQUEST.SESSION['filename']=filen[0:]
         
-        if not self.REQUEST.SESSION['filename']=="":
-            url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
-            if mode=="view":
-                self.REQUEST.RESPONSE.redirect(url)
-            elif mode=="download":
-                self.REQUEST.RESPONSE.redirect(url+"/download")
-                
+#        if not self.REQUEST.SESSION['filename']=="":
+#            url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
+#            if mode=="view":
+#                self.REQUEST.RESPONSE.redirect(url)
+#            elif mode=="download":
+#                self.REQUEST.RESPONSE.redirect(url+"/download")
+#                
         if self.REQUEST.has_key('showall'):
 
             self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
@@ -1939,8 +1939,7 @@ class ImageCollectionMD(ImageCollection,
             
 
             if overview and (generic =='No'):#
-                print "selected"
-                print repr(overview[0][1])
+              
                 return overview[0][1]()
             else:
                 pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
@@ -2065,9 +2064,10 @@ class ImageCollectionMD(ImageCollection,
         rc=[]
         fnIds={}
         for image in images:
+		
                 imagename=image.getElementsByTagName('imagename')[0]
-              
-                
+              	
+
                 
                 
                 idnr=image.getElementsByTagName('idnr')[0]
@@ -2088,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:
@@ -2099,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: