Changeset 2595

Timestamp:

01/27/10 12:45:45 (2 years ago)

Author:

mswertz

Message:

bugfix: for <field type="file" now uses entity name as folder name

Location:

molgenis/3.3/src/org/molgenis/generators/db

Files:

• JDBCMapperCommons.ftl (modified) (1 diff)
• MapperFileAttachments.java.ftl (modified) (1 diff)

molgenis/3.3/src/org/molgenis/generators/db/JDBCMapperCommons.ftl

@@ -22 +22 @@
                         String filename = entity.get${JavaName(field)}AttachedFile().toString();
                         String extension = filename.substring(filename.lastIndexOf('.'));
-                        filename = "TestFile/${JavaName(field)}"+<#list keyFields(entity) as f>entity.get${JavaName(f)}()<#if f_has_next>+"_"+</#if></#list>+extension; 
+                        filename = "${JavaName(entiy)}/${JavaName(field)}"+<#list keyFields(entity) as f>entity.get${JavaName(f)}()<#if f_has_next>+"_"+</#if></#list>+extension;       
                         entity.set${JavaName(field)}(filename);
         

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

@@ -32 +32 @@
                                 String filename = entity.get${JavaName(field)}AttachedFile().toString();
                                 String extension = filename.substring(filename.lastIndexOf('.'));
-                                filename = "TestFile/${JavaName(field)}"+<#list keyFields(entity) as f>entity.get${JavaName(f)}()<#if f_has_next>+"_"+</#if></#list>+extension; 
+                                filename = "${JavaName(entity)}/${JavaName(field)}"+<#list keyFields(entity) as f>entity.get${JavaName(f)}()<#if f_has_next>+"_"+</#if></#list>+extension;      
                                 entity.set${JavaName(field)}(filename);