Changeset 2599

Timestamp:

01/27/10 22:34:17 (2 years ago)

Author:

mswertz

Message:

bugfix molgenis:#63

File:

• molgenis/3.3/src/org/molgenis/generators/db/MapperMrefs.java.ftl (modified) (5 diffs)

molgenis/3.3/src/org/molgenis/generators/db/MapperMrefs.java.ftl

@@ -21 +21 @@
                                 //retrieve currently known mrefs
                                 QueryRule rule = new QueryRule( "${name(mref_local_field)}", QueryRule.Operator.EQUALS, entity.get${JavaName(pkey(entity))}() );
-                                List<${mref_entity}> existing_mrefs = getDatabase().find( ${mref_entity}.class, rule );         
+                                List<${JavaName(mref_entity)}> existing_mrefs = getDatabase().find( ${JavaName(mref_entity)}.class, rule );             
                                 //assign ids
                                 List<Integer> ids = new ArrayList<Integer>();
                                 List<String> labels = new ArrayList<String>();
-                                for(${mref_entity} ref: existing_mrefs)
+                                for(${JavaName(mref_entity)} ref: existing_mrefs)
                                 {
                                         ids.add(ref.get${JavaName(mref_remote_field)}());
@@ -48 +48 @@
                 {
                         // what mrefs to add/delete
-                        List<${mref_entity}> toDelete = new ArrayList<${mref_entity}>();
-                        List<${mref_entity}> toAdd = new ArrayList<${mref_entity}>();
+                        List<${JavaName(mref_entity)}> toDelete = new ArrayList<${JavaName(mref_entity)}>();
+                        List<${JavaName(mref_entity)}> toAdd = new ArrayList<${JavaName(mref_entity)}>();
 
                         for (${JavaName(entity)} entity : entities)
                         {
                                 //retrieve currently known mrefs
-                                QueryRule rule = new QueryRule( "${name(mref_local_field)}", QueryRule.Operator.EQUALS, entity.get${JavaName(pkey(entity))}() );
-                                List<${mref_entity}> existing_mrefs = getDatabase().find( ${mref_entity}.class, rule );
+                                QueryRule rule = new QueryRule( "${mref_local_field}", QueryRule.Operator.EQUALS, entity.get${JavaName(pkey(entity))}() );
+                                List<${JavaName(mref_entity)}> existing_mrefs = getDatabase().find( ${JavaName(mref_entity)}.class, rule );
 
                                 // check for removals
-                                for (${mref_entity} ref : existing_mrefs)
+                                List existing_ids = new ArrayList();
+                                for (${JavaName(mref_entity)} ref : existing_mrefs)
                                 {
+                                        existing_ids.add(ref.get${JavaName(mref_remote_field)}());
                                         if (!entity.get${JavaName(f)}().contains( ref.get${JavaName(mref_remote_field)}() ))
                                         {
@@ -69 +71 @@
                                 for (Integer ref : entity.get${JavaName(f)}())
                                 {
-                                        ${mref_entity} new_mref = new ${mref_entity}();
-                                        new_mref.set${JavaName(mref_local_field)}( entity.get${JavaName(pkey(entity))}() );
-                                        new_mref.set${JavaName(mref_remote_field)}( ref );
-                                        if (!existing_mrefs.contains( new_mref ))
+                                        if(!existing_ids.contains(ref))
                                         {
+                                                ${JavaName(mref_entity)} new_mref = new ${JavaName(mref_entity)}();
+                                                new_mref.set${JavaName(mref_local_field)}( entity.get${JavaName(pkey(entity))}() );
+                                                new_mref.set${JavaName(mref_remote_field)}( ref );
                                                 toAdd.add( new_mref );
                                         }
@@ -94 +96 @@
                 {
                         // what mrefs to add/delete
-                        List<${mref_entity}> toDelete = new ArrayList<${mref_entity}>();
+                        List<${JavaName(mref_entity)}> toDelete = new ArrayList<${JavaName(mref_entity)}>();
                                         
                         for (${JavaName(entity)} entity : entities)
@@ -100 +102 @@
                                 //retrieve currently known mrefs
                                 QueryRule rule = new QueryRule( "${name(mref_local_field)}", QueryRule.Operator.EQUALS, entity.get${JavaName(pkey(entity))}() );
-                                List<${mref_entity}> existing_mrefs = getDatabase().find( ${mref_entity}.class, rule );
+                                List<${JavaName(mref_entity)}> existing_mrefs = getDatabase().find( ${JavaName(mref_entity)}.class, rule );
 
                                 // check for removals
-                                for (${mref_entity} ref : existing_mrefs)
+                                for (${JavaName(mref_entity)} ref : existing_mrefs)
                                 {
                                         toDelete.add( ref );