--- MPIWGWeb/MPIWGProjects.py	2008/08/26 15:01:41	1.47.2.90
+++ MPIWGWeb/MPIWGProjects.py	2008/08/27 12:12:48	1.47.2.91
@@ -18,7 +18,7 @@ import logging
 import xmlhelper # Methoden zur Verwaltung der projekt xml
 from OFS.SimpleItem import SimpleItem
 from OFS.Folder import Folder
-
+from OFS.Image import Image
 from AccessControl import ClassSecurityInfo
 from bibliography import *
 import time
@@ -51,21 +51,37 @@ class MPIWGLink(MPIWGLink.MPIWGLink):
 class MPIWGTemplate(MPIWGTemplate.MPIWGTemplate):
     """depricated"""
     
-class MPIWGProject_publication(SimpleItem):
+class MPIWGProject_publication(Folder):
     """publications object fuer project"""
 
     meta_type="MPIWGProject_publication"
 
-    def editPublication(self,text=None,RESPONSE=None):
+    def editPublication(self,text=None,image1=None,image2=None,description=None,RESPONSE=None):
         """edit a publication"""
 
-        if (not text):
+        if (not text) and (not description):
             pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','edit_publicationForm.zpt')).__of__(self)
             return pt()
 
        
         self.text=text[0:]
-
+        self.description=description
+        
+        if image1:
+            if hasattr(self,'publicationImage1'):
+                self.publicationImage1.manage_upload(image1)
+            else:
+                nO = Image('publicationImage1','',image1)
+                self._setObject('publicationImage1',nO)
+                
+        if image2:
+            if hasattr(self,'publicationImage2'):
+                self.publicationImage2.manage_upload(image2)
+            else:
+                nO = Image('publicationImage2','',image2)
+                self._setObject('publicationImage2',nO)
+                   
+            
         if RESPONSE:
             RESPONSE.redirect("../managePublications")
             
@@ -924,8 +940,8 @@ class MPIWGProject(CatalogAware,Folder):
             text5=""
 
         logging.debug("getcontent: field=%s filter=%s -> %s"%(field,filter,repr(text5)))
-        #return unicodify(text5)
-        return utf8ify(text5) # return as utf-8 byte string
+        return unicodify(text5)
+        #return utf8ify(text5) # return as utf-8 byte string
 
 
     def showImagesOfPage(self,imageUrl=None):
@@ -1078,8 +1094,10 @@ class MPIWGProject(CatalogAware,Folder):
             logging.info("Search: %s %s %s"%(name,firstname,lastname))
             firstname=firstname.capitalize()
             lastname=lastname.capitalize()
-            cataloggedNames=self.MembersCatalog(firstName=firstname,lastName=lastname)
-            
+            try:
+                cataloggedNames=self.MembersCatalog(firstName=firstname,lastName=lastname)
+            except:
+                cataloggedNames=[]
             #Teste ob die ensprechenden Namen schon der Liste zu geordnet sind
             #if not hasattr(self,'responsibleScientistsList'):
             #     self.responsibleScientistsList={}