Changeset 3451

Timestamp:

Jun 5, 2007, 12:07:54 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #588

File:

• branches/2.3.1/src/plugins/core/net/sf/basedb/plugins/BioAssaySetExporter.java (modified) (11 diffs)

branches/2.3.1/src/plugins/core/net/sf/basedb/plugins/BioAssaySetExporter.java

@@ -206 +206 @@
           throw new BaseException("Unknown field in reporter fields: "+field);
         }
-        query.select(Selects.expression(BioAssaySetUtil.createJepExpression(dc, bas, qi.getJep(), true), field));
+        query.select(Selects.expression(BioAssaySetUtil.createJepExpression(dc, bas, qi.getJep(), true), qi.getQueryAlias()));
       }
       for (String field : spotFields)
@@ -215 +215 @@
           throw new BaseException("Unknown field in spot fields: "+field);
         }
-        query.select(Selects.expression(BioAssaySetUtil.createJepExpression(dc, bas, qi.getJep(), true), field));
+        query.select(Selects.expression(BioAssaySetUtil.createJepExpression(dc, bas, qi.getJep(), true), qi.getQueryAlias()));
       }
       if (mergeReporters)
@@ -221 +221 @@
         throw new BaseException("'Merge on reporter' not implemented");
       }   
-      exportBaseFileSectionSpots(out, dc, bas, query, reporterFields, spotFields, bas.getBioAssays().list(dc));
+      exportBaseFileSectionSpots(out, dc, bas, query, reporterFields, spotFields, bas.getBioAssays().list(dc), qis);
     }
     finally
@@ -293 +293 @@
           if (qi == null)
             throw new BaseException("Unknown column: "+field+" (you can add this field using a formula)");
-          query.select(Selects.expression(BioAssaySetUtil.createJepExpression(dc, bas, qi.getJep(), true), field));
+          query.select(Selects.expression(BioAssaySetUtil.createJepExpression(dc, bas, qi.getJep(), true), qi.getQueryAlias()));
         }
         for (String field : spotFields)
@@ -300 +300 @@
           if (qi == null)
             throw new BaseException("Unknwon field: "+field+" (you can add this field using a formula)");
-          query.select(Selects.expression(BioAssaySetUtil.createJepExpression(dc, bas, qi.getJep(), true), field));
+          query.select(Selects.expression(BioAssaySetUtil.createJepExpression(dc, bas, qi.getJep(), true), qi.getQueryAlias()));
         }
         if (mergeReporters)
@@ -307 +307 @@
         }
   
-        exportBaseFileSectionSpots(out, dc, bas, query, reporterFields, spotFields, Collections.singletonList(ba));
+        exportBaseFileSectionSpots(out, dc, bas, query, reporterFields, spotFields, Collections.singletonList(ba), qis);
         
         out.println();
@@ -320 +320 @@
 
   private void exportBaseFileSectionSpots(PrintWriter out, DbControl dc, BioAssaySet bas, DynamicSpotQuery query,
-    List<String> reporterFields, List<String> spotFields, List<BioAssay> assays)
+    List<String> reporterFields, List<String> spotFields, List<BioAssay> assays, Map<String, QueryItem> qi)
     throws SQLException
   {
@@ -365 +365 @@
     for (String column : reporterFields)
     {
-      reporterIndex.add(iterator.getIndex(column));
+      reporterIndex.add(iterator.getIndex(qi.get(column).getQueryAlias()));
     }
     for (String field : spotFields)
     {
-      spotIndex.add(iterator.getIndex(field));
+      spotIndex.add(iterator.getIndex(qi.get(field).getQueryAlias()));
     }
     int posIndex = iterator.getIndex("_position");
@@ -1024 +1024 @@
     
     private String jep;
+
+    private String queryAlias;
     
     QueryItem(String name, String title, String jep)
@@ -1030 +1032 @@
       this.title = title;
       this.jep = jep;
-    }
+      this.queryAlias = "a" + Math.abs(System.identityHashCode(name));
+  }
 
     public final String getJep()
@@ -1045 +1048 @@
     {
       return title;
+    }
+
+    public final String getQueryAlias()
+    {
+      return queryAlias;
     }
   }