--- MPIWGWeb/MPIWGProjects.py	2005/11/22 17:58:27	1.47.2.42
+++ MPIWGWeb/MPIWGProjects.py	2006/01/16 15:21:47	1.47.2.47
@@ -826,7 +826,7 @@ class MPIWGRoot(ZSQLExtendFolder):
                                           vorname,username,title,position,e_mail,
                                           e_mail_p,date_from,date_to,
                                           abteilung,heimat_inst,funded_by,
-                                          e_mail2,txt,txt_p)
+                                          e_mail2,txt,txt_p,stay_at_mpiwg)
                     RESPONSE.write("""<p>%s</p>"""%ret[1].encode('utf-8'))
                 except:
                     RESPONSE.write("<p>ERROR:%s %s %s</p>\n"%(username.encode('utf-8'),name.encode('utf-8'),vorname.encode('utf-8')))
@@ -850,16 +850,29 @@ class MPIWGRoot(ZSQLExtendFolder):
 
                 obj=getattr(memberFolder,username)
                 
-                obj.updateDBEntry(DBid=id,publish_the_data=publish_the_data,
+                done= obj.updateDBEntry(DBid=id,publish_the_data=publish_the_data,
                                    date_from=date_from,
                                    date_to=date_to,stay_at_mpiwg=stay_at_mpiwg,position=position)
+                if not done and (publish_the_data=='yes'):
+                        
+                    ret=obj.createNewDBEntry(publish_the_data,id,name,
+                                          vorname,username,title,position,e_mail,
+                                          e_mail_p,date_from,date_to,
+                                          abteilung,heimat_inst,funded_by,
+                                          e_mail2,txt,txt_p,stay_at_mpiwg)
+                    if not ret[0]:
+
+                            RESPONSE.write("<p>Error: %s</p>\n"%repr(ret[1]))
+                    else:
+                        RESPONSE.write("<p>New: %s</p>\n"%repr(ret[1]))
 
         #TODO: reindexCatlogs and updatePublications wieder einbaue
         #self.reindexCatalogs(RESPONSE)
     
-        #self.updatePublicationDB() 
-        
-	RESPONSE.write("<h2>Done</h2></body></html>")
+        #self.updatePublicationDB()
+ 
+        #self.ZSQLResetConnection()
+        RESPONSE.write("<h2>Done</h2></body></html>")
                    
         return True
      
@@ -1399,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:])
 
-        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')
@@ -1908,7 +1958,7 @@ class MPIWGProject(CatalogAware,Folder):
         start=kupu.find("<body>")
         end=kupu.find("</body>")
         newcontent= kupu[start+6:end]
-        print newcontent
+        
         if preview:
             
             return self.preview(newcontent)