--- ImageArchive/ImageArchive.py	2004/11/17 15:38:23	1.36
+++ ImageArchive/ImageArchive.py	2004/11/24 17:03:23	1.40
@@ -13,6 +13,16 @@ import operator
 import tempfile
 import shutil
 
+
+try:
+    from Products.ECHO_content.ECHO_collection import ECHO_basis
+except:
+    print "ECHO Elements not imported"
+    class ECHO_basis:
+        """leer"""
+        manage_options=()
+
+
 def splitPath(str):
 	str2=str.replace("\\","/")
 	return os.path.split(str2)[1]
@@ -190,10 +200,6 @@ class ImageDigilib(Folder,Persistent,Imp
         #DEVELOP: take first one for server
         
         path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]
-
-        #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename
-        #self.REQUEST.SESSION['string']="<img src=\"%s\">"% path
-        #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt')).__of__(self)
         return self.REQUEST.RESPONSE.redirect(path)
 
     
@@ -215,10 +221,12 @@ def manage_AddImageDigilib(self,id,fileu
         RESPONSE.redirect('manage_main')
 
                  
-class ImageCollection(Folder, Persistent, Implicit):
+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']
@@ -226,8 +234,8 @@ class ImageCollection(Folder, Persistent
     
     defaultMetaString="http://fm-web.mpiwg-berlin.mpg.de:8050/FMRes/FMPJS?-db=Wissenschaftlerportraits.fp5&-layID=69&-token=25&-max=1&-format=formvwcss.htm&-mode=browse&images::filename=%s&-find" ## TEST FUER IMAGEDATENBANK WP
 
-
- 
+   
+    
     def createSet(self,RESPONSE=None,local=None,version="working"):
 	    """download aller gewaehlten files"""
 	    tempfile.tempdir="/tmp/archivesImageServer"
@@ -268,7 +276,7 @@ class ImageCollection(Folder, Persistent
 
 		    if local:
 			    if version=="working":
-				    sourcePath="/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+id[0]
+				    sourcePath="/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg"
 			    else:
 				    sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0]
 			    targetPath=tmpPath+"/"+filename
@@ -405,28 +413,21 @@ class ImageCollection(Folder, Persistent
         self.ImageViewerPath=ImageViewerPath
         self.defaultMetaString=defaultMetaString
 
-    manage_options = Folder.manage_options+(
+    if ECHO_basis:
+        optTMP= Folder.manage_options+ECHO_basis.manage_options
+    else:
+        optTMP= Folder.manage_options
+
+    manage_options = optTMP+(
         {'label':'Main Config','action':'ImageCollection_config'},
         {'label':'Import','action':'ImportFiles'},
         {'label':'Recalculate Metadata','action':'recalculateMeta'},
         {'label':'Import Metadata','action':'importMetaForm'},
         {'label':'Rescale thumbs','action':'scaleThumbs'},
 	{'label':'Rescale working version','action':'scaleWorkingVersions'},
-        {'label':'Weight (ECHO)','action':'weightForm'},
         )
 
-    def weightForm(self):
-        """Weight"""
-        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeWeight.zpt')).__of__(self)
-        return pt()
-
-    def changeWeight(self,weight,RESPONSE=None):
-        """Change weight"""
-        self.weight=weight
-        
-        if RESPONSE is not None:
-            RESPONSE.redirect('manage_main')
-
+    
         
     def importMetaForm(self):
         """import metadata"""
@@ -541,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:
@@ -552,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]
@@ -561,9 +564,17 @@ class ImageCollection(Folder, Persistent
 			nop=int(nopT)
 		except:
 			nop=0
-		if not text=="":
-			rc.append((str(text),id,nop))
-			fnIds[str(text)]=(id,nop)
+                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
 	self.REQUEST.SESSION['filenamesIds']=fnIds
@@ -979,6 +990,7 @@ class ImageCollection(Folder, Persistent
     def navig_html(self):
         """navigation"""
         #self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
+       
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation.zpt')).__of__(self)
         return pt()
 
@@ -1000,15 +1012,15 @@ class ImageCollection(Folder, Persistent
         else:
             filen=""
 
-        self.REQUEST.SESSION['filename']=filen
-        
+        self.REQUEST.SESSION['filename']=filen[0:]
+
         if self.REQUEST.has_key('showall'):
 
             self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
         else:
             self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no')
             
-        
+     
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview.zpt')).__of__(self)
         return pt()