--- MPIWGWeb/MPIWGProjects.py	2006/01/16 13:46:21	1.47.2.46
+++ MPIWGWeb/MPIWGProjects.py	2006/01/16 15:21:47	1.47.2.47
@@ -1412,33 +1412,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:])
+
+
+                splitted=split2.split("""<p class="picturetitle">""")
+                if len(splitted)>1:
+                    tmp=splitted[1].split("</p>")
+                    imageCaptions.append(tmp[0].encode('utf-8'))
+
 
-        filename=self.imageURL.split("/")[-1]
-        #lege neues images object an, mit leerem bild
+                else:
+                    #keine caption
 
-        if self.ZopeFind(self,obj_ids=[filename]):
-            #existiert das bild schon, dann neueun filenamen
-            filename="project_image_"+filename
+                    imageCaptions.append("")
+                
+          
+
+        
+        
+        
+        
+        #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,self.imagecap,filename=filename)
-        #hole die bilddaten aus der url
-        url=self.absolute_url()+"/"+self.imageURL
-        #url=self.absolute_url()+"/"+filename
-        
-        try:#relative url
-            data=urllib.urlopen(url).read()
-        except:
-            try:#absolute
-                data=urllib.urlopen(self.imageURL).read()
+            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')