Changeset 2665

Timestamp:

02/26/10 16:00:42 (2 years ago)

Author:

jlops

Message:

Date releated problems solved, needs to be tested (executeAdd, excuteUpdate)

File:

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

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

@@ -20 +20 @@
                         
                                 //retrieve currently known mrefs
-                                QueryRule rule = new QueryRule( "${name(mref_local_field)}", QueryRule.Operator.EQUALS, entity.get${JavaName(f)}() );
+                                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 );         
                                 //assign ids
@@ -77 +77 @@
                                         if (!existing_mrefs.contains( new_mref ))
                                         {
-                                                ${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 );
+                                                ${JavaName(mref_entity)} new_mref1 = new ${JavaName(mref_entity)}();
+                                                new_mref1.set${JavaName(mref_local_field)}( entity.get${JavaName(pkey(entity))}() );
+                                                new_mref1.set${JavaName(mref_remote_field)}( ref );
+                                                toAdd.add( new_mref1 );
                                         }
                                 }