Changeset 2675

Timestamp:

03/08/10 13:28:43 (2 years ago)

Author:

mswertz

Message:

added csv macro

Location:

molgenis/3.3/src/org/molgenis/generators

Files:

• GeneratorHelper.ftl (modified) (1 diff)
• GeneratorHelper.java (modified) (4 diffs)

molgenis/3.3/src/org/molgenis/generators/GeneratorHelper.ftl

@@ -299 +299 @@
         <#return helper.getMysqlType(model, field)/>
 </#function>
+<#function csv items>
+        <#local result = "">
+        <#list items as item>
+                <#if item_index != 0>
+                        <#local result =  result + ",">
+                </#if>
+                <#if item?is_hash>
+                        <#local result = result + item.name>
+                <#else>
+                        <#local result = result +item>
+                </#if>
+        </#list>
+        <#return result>
+</#function>

molgenis/3.3/src/org/molgenis/generators/GeneratorHelper.java

@@ -176 +176 @@
                 String result = "";
 
-                for (String str : elements)
+                if(elements != null) for (String str : elements)
                 {
                         result += ((elements.get(0) == str) ? "" : ",") + "'" + str + "'";
@@ -537 +537 @@
         public Field getXrefField(Model model, Field e) throws Exception
         {
-                return model.getEntity(e.getXRefEntity()).getField(e.getXRefField());
+                return e.getXrefEntity().getField(e.getXrefFieldName());
         }
 
@@ -547 +547 @@
                         case XREF_SINGLE:
                         {
-                                Entity e_ref = (Entity) model.getDatabase().get(field.getXRefEntity());
-                                Field f_ref = e_ref.getField(field.getXRefField());
+                                Entity e_ref = field.getXrefEntity();
+                                Field f_ref = field.getXrefField();
                                 return getFieldType(model, f_ref);
                         }
                         case XREF_MULTIPLE:
                         {
-                                Entity e_ref = (Entity) model.getDatabase().get(field.getXRefEntity());
-                                Field f_ref = e_ref.getField(field.getXRefField());
+                                Entity e_ref = field.getXrefEntity();
+                                Field f_ref = field.getXrefField();
                                 return getFieldType(model, f_ref);
                         }
@@ -695 +695 @@
                         {
 
-                                String fullClassName = m.getEntity(f.getXRefEntity()).getNamespace() + subpackage
-                                                + this.firstToUpper(f.getXRefEntity())+suffix;
+                                String fullClassName = f.getXrefEntity().getNamespace() + subpackage
+                                                + this.firstToUpper(f.getXrefEntityName())+suffix;
                                 if (!imports.contains(fullClassName))
                                 {