Changeset 2652

Timestamp:

02/19/10 16:38:19 (2 years ago)

Author:

rwagner

Message:

pom updated

Location:

maven_sequence_lims/molgenis3_4_maven/src/main/java/org/molgenis

Files:

• framework/data/jpa/JpaCustomQuery.java (modified) (3 diffs)
• framework/server/AbstractMolgenisServlet.java (modified) (1 diff)
• util/tuple/HttpServletRequestTuple.java (modified) (1 diff)

maven_sequence_lims/molgenis3_4_maven/src/main/java/org/molgenis/framework/data/jpa/JpaCustomQuery.java

@@ -84 +84 @@
                 if (fieldNames.size() == 0) throw new DatabaseException("no fields selected");
                 
-                String qlQuery = "SELECT %s FROM %s";           
-                List<Entity> entities = new ArrayList<Entity>();
+                        
+                //List<Entity> entities = new ArrayList<Entity>();
                 List<QueryRule> rules = new ArrayList<QueryRule>();
                 rules.addAll(Arrays.asList(ruleArray));
@@ -106 +106 @@
                 StringBuilder fieldList = new StringBuilder();          
                 for(String fieldName : fieldNames) {
-                        fieldList.append(fieldName);
+                        fieldList.append(fieldName.toLowerCase());
                         
                         if(idx++ < fieldNames.size() - 1) {
@@ -112 +112 @@
                         }                       
                 }               
-                qlQuery = String.format(qlQuery, fieldList.toString(),  entitiesList.toString());
+                String qlQuery = "SELECT %s FROM %s";   
+                qlQuery = String.format(qlQuery, fieldList.toString(),  entitiesList.toString());
                 System.out.println(qlQuery);
 

maven_sequence_lims/molgenis3_4_maven/src/main/java/org/molgenis/framework/server/AbstractMolgenisServlet.java

@@ -971 +971 @@
 
                         Tuple req = new HttpServletRequestTuple(request);
-
                         String xref_entity = Class.forName(req.getString("xref_entity")).getSimpleName();;
                         String xref_field = xref_entity + "."+req.getString("xref_field");

maven_sequence_lims/molgenis3_4_maven/src/main/java/org/molgenis/util/tuple/HttpServletRequestTuple.java

@@ -117 +117 @@
                         for( Object key : request.getParameterMap().keySet() )
                         {
+                            if(((String)key).equals("xref_entity"))
+                                this.set((String)key, "generated." +  request.getParameter((String)key));
+                            else
                                 this.set((String)key, request.getParameter((String)key));
+                            
                         }
                         logger.debug("Converted HTTP get/non-multipart request into Tuple:" + this.toString());