--- MPIWGWeb/MPIWGProjects.py	2006/01/16 13:46:21	1.47.2.46
+++ MPIWGWeb/MPIWGProjects.py	2006/04/05 13:03:10	1.47.2.50
@@ -888,6 +888,7 @@ class MPIWGRoot(ZSQLExtendFolder):
             
         
     
+        
            
         if RESPONSE:
             RESPONSE.redirect('manage_main')
@@ -933,25 +934,35 @@ class MPIWGRoot(ZSQLExtendFolder):
             RESPONSE.redirect('manage_main')
 
         
-    def getAllMembers(self):
-        """give list of all members"""
-        ret=[]
+#    def getAllMembers(self,reset=None):
+#        """give list of all members"""
+#        ret=[]
+#
+#
+#        if reset or (getattr(self,'_v_membersList',None) is None):
+#            for member in self.members._objects:
+#                if member['meta_type']=='MPIWGStaff':
+#                    memberObj=getattr(self.members,member['id'])
+#                    if memberObj.isPublished():
+#                           ret.append(memberObj.title.decode('utf-8'))
+#            
+#            ret.sort()
+#            self._v_membersList=ret[0:]
+#        print ret
+#  
+#        return self._v_membersList
 
-        #for x in self.members.objectValues('MPIWGStaff'):
-            #print x.title
-        #    ret.append(x.title.decode('utf-8'))
-
-        for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):
-            if x[1].isPublished():
-                               ret.append(x[1].title.decode('utf-8'))
-            
-        ret.sort()
-        #print ret
-  
+    def getAllMembers(self):
+        #ret=[]
+        
+        results=self.MembersCatalog({'isPublished':True})
+ 
+        ret=[", ".join([proj.lastName, proj.firstName]).decode('utf-8') for proj in results]
+        
+	ret.sort()
         return ret
-
     def printAllMembers(self):
-        """prin"""
+        """print"""
         members=self.getAllMembers()
         ret=""
         for x in members:
@@ -1186,8 +1197,10 @@ class MPIWGRoot(ZSQLExtendFolder):
         """give tuple member /projects"""
         ret=[]
         members=self.getAllMembers()
+       
         #return str(members)
         for x in members:
+         
             ret+=self.getProjectsOfMember(name=x,date=date)
             
         return ret
@@ -1412,33 +1425,70 @@ class MPIWGProject(CatalogAware,Folder):
             RESPONSE.redirect('managePublications')
         
     
-    def copyImageToMargin(self,RESPONSE=None):
-        #TODO: copy more than one image
+    def copyImageToMargin(self,RESPONSE=None):  
         """copy inline images to marginal images"""
-        self.getContent('WEB_project_description',filter='yes')
+        
+        
+        #getImages from WEB_project_description
+        description=self.getContent('WEB_project_description')
+        
+        text2=description
+        splitted=text2.split("""<p class="picture">""")
+        
+        imageURLs=[]
+        imageCaptions=[]
+        for split in  splitted[1:]:
+                tmp=split.split("</p>")
+                #return repr(splitted[1])
+                try:
+                        imageURLs.append(tmp[0].split("\"")[1].encode('utf-8'))
+                except:
+                        imageURLs.append(tmp[0].split("src=")[1].split(" ")[0].encode('utf-8'))
+                
+                split2="</p>".join(tmp[1:])
 
-        filename=self.imageURL.split("/")[-1]
-        #lege neues images object an, mit leerem bild
 
-        if self.ZopeFind(self,obj_ids=[filename]):
-            #existiert das bild schon, dann neueun filenamen
-            filename="project_image_"+filename
-            
-        self.addImage(None,self.imagecap,filename=filename)
-        #hole die bilddaten aus der url
-        url=self.absolute_url()+"/"+self.imageURL
-        #url=self.absolute_url()+"/"+filename
+                splitted=split2.split("""<p class="picturetitle">""")
+                if len(splitted)>1:
+                    tmp=splitted[1].split("</p>")
+                    imageCaptions.append(tmp[0].encode('utf-8'))
+
+
+                else:
+                    #keine caption
+
+                    imageCaptions.append("")
+                
+          
+
         
-        try:#relative url
-            data=urllib.urlopen(url).read()
-        except:
-            try:#absolute
-                data=urllib.urlopen(self.imageURL).read()
+        
+        
+        
+        #eintragen:
+        for imageURL in imageURLs:
+            filename=imageURL.split("/")[-1]
+            #lege neues images object an, mit leerem bild
+
+            if self.ZopeFind(self,obj_ids=[filename]):
+                #existiert das bild schon, dann neuen filenamen
+                filename="project_image_"+filename
+            
+            self.addImage(None,imageCaptions[imageURLs.index(imageURL)],filename=filename)
+            #hole die bilddaten aus der url
+            url=self.absolute_url()+"/"+imageURL
+            #url=self.absolute_url()+"/"+filename
+        
+            try:#relative url
+                data=urllib.urlopen(url).read()
             except:
-                zLOG.LOG("MPIWG Project",zLOG.ERROR,"can't open: %s"%url)
+                try:#absolute
+                    data=urllib.urlopen(self.imageURL).read()
+                except:
+                    zLOG.LOG("MPIWG Project",zLOG.ERROR,"can't open: %s"%url)
             
-        obj=getattr(self,filename)
-        obj.update_data(data)
+            obj=getattr(self,filename)
+            obj.update_data(data)
         
         if RESPONSE:
             RESPONSE.redirect('manageImages')