--- MPIWGWeb/MPIWGProjects.py	2007/04/19 12:18:50	1.47.2.73
+++ MPIWGWeb/MPIWGProjects.py	2007/04/19 13:32:35	1.47.2.74
@@ -891,8 +891,11 @@ class MPIWGRoot(ZSQLExtendFolder):
          
         columns=data.keys()
         for x in ignoreEntries:
-            columns.remove(x)
-            
+            logging.info("ign rem: %s"%x)
+            try: #falls in ignore entries felder sind, die nicht in columns sind, fange den fehler ab
+             columns.remove(x)
+            except:
+                pass
 
         
         insert=[]
@@ -946,7 +949,7 @@ class MPIWGRoot(ZSQLExtendFolder):
             ret+="<h2>Bei €nderung belassen</h2>"
             ret+="<p>Bitte die Filemaker-db entsprehchend Šndern</p>"
             
-            
+        # konflicte   
         for conflict in conflicts.keys():
             ignoreEntries=[]
             displayIgnored=[]
@@ -963,7 +966,13 @@ class MPIWGRoot(ZSQLExtendFolder):
                 ret+="</tabel>"
                 
             self.updatePersonEntry(resultSet[conflict],ignoreEntries=ignoreEntries)
-            
+         
+         # rest
+        cl=list(conflicts.keys())
+        
+        for key in resultSet.keys():
+             if key not in cl:
+                 self.updatePersonEntry(resultSet[key])
         return ret+"</body></html>"
                      
     def updateInstitutsbiliography(self):