Changeset 2491

Timestamp:

Aug 8, 2006, 9:51:46 AM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #168: Use formulas in table listings of bioassay data

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/DynamicUtil.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ItemContext.java (modified) (3 diffs)
• www/views/experiments/bioassays/spotdata/list_spotdata.jsp (modified) (3 diffs)
• www/views/experiments/explorer/view/view.jsp (modified) (1 diff)

trunk/src/clients/web/net/sf/basedb/clients/web/DynamicUtil.java

@@ -114 +114 @@
   */
   
-  // TODO - fix for use with table listings
   public static void addFormulaColumns(List<TableColumn> columns, DbControl dc, RawDataType rawDataType, Formula.Type type, String idPrefix, String titlePrefix)
   {

trunk/src/core/net/sf/basedb/core/ItemContext.java

@@ -35 +35 @@
 import net.sf.basedb.core.query.JoinType;
 import net.sf.basedb.core.query.Select;
+import net.sf.basedb.core.query.Selects;
 import net.sf.basedb.core.data.ContextData;
 import net.sf.basedb.core.data.PropertyFilterData;
@@ -1007 +1008 @@
       // TODO
     }
+    else if (propertyDef.startsWith("="))
+    {
+      // propertyDef is JEP expression
+      joins.joinRawData |= propertyDef.contains("raw(");
+      Expression e = Jep.formulaToExpression(propertyDef.substring(1), ch, raw);
+      s = Selects.expression(e, "jep" + joins.getNextAlias());
+    }
     else
     {
@@ -1036 +1044 @@
     public boolean joinRawData = false;
     public boolean joinReporters = false;
+    
+    private int nextAlias = 0;
+    
+    public int getNextAlias()
+    {
+      return ++nextAlias;
+    }
+    
   }
   

trunk/www/views/experiments/bioassays/spotdata/list_spotdata.jsp

@@ -39 +39 @@
   import="net.sf.basedb.core.DynamicResultIterator"
   import="net.sf.basedb.core.PluginDefinition"
+  import="net.sf.basedb.core.Formula"
   import="net.sf.basedb.core.plugin.GuiContext"
   import="net.sf.basedb.core.plugin.Plugin"
@@ -87 +88 @@
   List<TableColumn> columns = new LinkedList<TableColumn>();
   DynamicUtil.addSpotColumns(columns, rawDataType.getChannels());
+  DynamicUtil.addFormulaColumns(columns, dc, rawDataType, Formula.Type.COLUMN_EXPRESSION, "frm.", "");
   DynamicUtil.addRawDataColumns(columns, rawDataType, "raw.", "$", "[Raw] ");
   DynamicUtil.addReporterColumns(columns, "rep.", "@", "[Rep] ");
   // TODO - DynamicUtil.addExtraColumns(columns);
-  // TODO - DynamicUtil.addFormulaColumns(columns);
   DynamicUtil.SelectedInfo selected = DynamicUtil.getSelectedColumns(cc, columns);
   
@@ -105 +106 @@
   int numListed = 0;
   %>
-
   <base:page title="<%=title%>">
   <base:head scripts="table.js,tabcontrol.js" styles="table.css,toolbar.css,headertabcontrol.css,path.css">

trunk/www/views/experiments/explorer/view/view.jsp

@@ -101 +101 @@
   List<TableColumn> columns = new LinkedList<TableColumn>();
   DynamicUtil.addSpotColumns(columns, rawDataType.getChannels());
-  DynamicUtil.addFormulaColumns(columns, dc, rawDataType, Formula.Type.COLUMN_EXPRESSION, "frm", "");
+  DynamicUtil.addFormulaColumns(columns, dc, rawDataType, Formula.Type.COLUMN_EXPRESSION, "frm.", "");
   DynamicUtil.addRawDataColumns(columns, rawDataType, "raw.", "$", "[Raw] ");
   // TODO - DynamicUtil.addExtraColumns(columns);