Changeset 3440

Timestamp:

08/26/10 16:39:28 (18 months ago)

Author:

jlops

Message:

Some small fixes

The code in ObservableFeatureCSVReader

-resolveForeignKyes(Data...

has some problem in the part ("resolve xref 'ontolog..'" from composite key ...)
that the query is not constructed

Location:

molgenis/3.6_experimental/molgenis3.3

Files:

• .classpath (modified) (2 diffs)
• src/org/molgenis/framework/db/jpa/JPAQueryGeneratorUtil.java (modified) (3 diffs)
• src/org/molgenis/framework/db/jpa/JpaUtil.java (added)
• src/org/molgenis/generators/tests/TestCsvGen.java.ftl (modified) (3 diffs)
• src/org/molgenis/generators/ui/FormScreenGen.java.ftl (modified) (2 diffs)

molgenis/3.6_experimental/molgenis3.3/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+        <classpathentry exported="true" kind="lib" path="lib/javax.persistence_2.0.0.v201002051058.jar"/>
         <classpathentry kind="src" path="src"/>
         <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
@@ -461 +462 @@
         <classpathentry exported="true" kind="lib" path="lib/eclipselink-jpa-modelgen_2.0.2.v20100323-r6872.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/eclipselink.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/javax.persistence_2.0.0.v201002051058.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

molgenis/3.6_experimental/molgenis3.3/src/org/molgenis/framework/db/jpa/JPAQueryGeneratorUtil.java

@@ -135 +135 @@
                                 } else {
                                     try {
-                                        if (root.get(attributeName).getJavaType().newInstance() instanceof Entity) {
+                                        
+                                        if(attributeName.matches("[^_]+_[^_]+")) {
+                                                String[] split = attributeName.split("_");
+                                                String xrefAttribute = split[0];
+                                                String xrefTargetAttribute = split[1];
+                                                
+                                                Entity entity = (Entity) root.getJavaType().newInstance();
+                                            String xrefAttribtename = entity.getXrefIdFieldName(xrefAttribute);
+                                            //it's a xref
+                                           Join join = root.join(xrefAttribute);
+                                           Expression attribute = join.get(xrefTargetAttribute);
+                                           Object value = rule.getValue();
+                                           predicate = cb.equal(attribute, value);                                              
+                                        } else if (root.get(attributeName).getJavaType().newInstance() instanceof Entity) {
                                             Entity entity = (Entity) root.getJavaType().newInstance();
                                             String xrefAttribtename = entity.getXrefIdFieldName(attributeName);
@@ -151 +164 @@
                                         //LogFactory.getLog(JPAQueryGeneratorUtil.class.getName()).log(Level.SEVERE, null, ex);
                                     } catch (IllegalAccessException ex) {
-                                        logger.error(ex);
+                                        //if the path not exist on root then this exception occurs (in case a xref_label to an xref of the object).
+                                        ex.printStackTrace();
+                                        //throw new DatabaseException(ex);
                                     }
                                 }
@@ -199 +214 @@
                         //make a where clause from the predicate
                         if (whereClause != null) {
-                            assert predicate != null : rule.getOperator();
+//                            assert predicate != null : rule.getOperator();
 
                             if(predicate != null) { //is this a bug? 28553 DEBUG [AbstractPager] added filter '(experiment='1' OR'null' )'. 

molgenis/3.6_experimental/molgenis3.3/src/org/molgenis/generators/tests/TestCsvGen.java.ftl

@@ -22 +22 @@
 <#if databaseImp != 'jpa'>      
 import app.JDBCDatabase;
+<#else>
+import org.molgenis.framework.db.jpa.JpaDatabase;
+import org.molgenis.framework.db.jpa.JpaUtil;
 </#if>
 
@@ -107 +110 @@
         
                 //clean database
-                new Molgenis("molgenis.test.properties").updateDb();
+                
+                <#if databaseImp = 'jpa'>
+                        JpaUtil.dropAndCreateTables( ((JpaDatabase)db).getEntityManager() );
+                <#else>
+                        new Molgenis("molgenis.test.properties").updateDb();
+                </#if>
                 
                 //import dir2 into database
@@ -122 +130 @@
                 new CsvExport().exportAll(dir3,db);
                 
-                //clean database
-                new Molgenis("molgenis.test.properties").updateDb();
+                <#if databaseImp = 'jpa'>
+                        JpaUtil.dropAndCreateTables( ((JpaDatabase)db).getEntityManager() );
+                <#else>
+                        new Molgenis("molgenis.test.properties").updateDb();
+                </#if>
                 
                 //import dir3 into database

molgenis/3.6_experimental/molgenis3.3/src/org/molgenis/generators/ui/FormScreenGen.java.ftl

@@ -67 +67 @@
                 this.setLimit(${form.limit});
 <#if form.sortby?exists>
+/*
+                //blaat: ${form.sortby}
                 //sort is a bit hacky awaiting redesign of the Form classes
                 try
@@ -78 +80 @@
                         e.printStackTrace();
                 }
+*/
 </#if>          
                 this.setMode(FormModel.Mode.${form.viewType});