Changeset 2813

Timestamp:

Oct 27, 2006, 1:33:55 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #415: Can't select avg option in Experiment explorer when using Postgres

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/DynamicUtil.java (modified) (2 diffs)
• src/clients/web/net/sf/basedb/clients/web/ExperimentExplorer.java (modified) (1 diff)
• www/views/experiments/explorer/search/list.jsp (modified) (1 diff)
• www/views/experiments/explorer/view/view.jsp (modified) (3 diffs)
• www/views/experiments/spotdata/list_spotdata.jsp (modified) (1 diff)

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

@@ -192 +192 @@
   }
   
-  public static SelectedInfo getSelectedColumns(ItemContext cc, List<TableColumn> columns)
+  public static SelectedInfo getSelectedColumns(ItemContext cc, List<TableColumn> columns, boolean isAveraging)
   {
     List<String> selectedIds = new ArrayList<String>(columns.size());
@@ -205 +205 @@
       if (allVisible || visible.contains(tc.getId()) || tc.getShow().equals("always"))
       {
-        selectedProperties.add(tc.getProperty());
-        selectedIds.add(tc.getId());
+        if (!isAveraging || tc.isAveragable())
+        {
+          selectedProperties.add(tc.getProperty());
+          selectedIds.add(tc.getId());
+        }
       }
     }

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

@@ -782 +782 @@
       {
         Expression sortby = ItemContext.getDynamicExpression(dc, sortProperty);
+        if (positionIndex == SPOT_AVG)
+        {
+          sortby = Aggregations.mean(sortby);
+        }
         if (sortby != null)
         {

trunk/www/views/experiments/explorer/search/list.jsp

@@ -91 +91 @@
   DynamicUtil.addReporterColumns(columns, dc, "", "@", "");
   
-  DynamicUtil.SelectedInfo selected = DynamicUtil.getSelectedColumns(cc, columns);
+  DynamicUtil.SelectedInfo selected = DynamicUtil.getSelectedColumns(cc, columns, false);
   Map<String, Integer> selectedIndex = new HashMap<String, Integer>();
   for (int i = 0; i < selected.selectedIds.size(); ++i)

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

@@ -76 +76 @@
   import="java.util.LinkedList"
   import="java.util.Collection"
+  import="java.util.Arrays"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -116 +117 @@
     new SpotImageFormatter(dc, rawDataType, root)));
 
-  DynamicUtil.SelectedInfo selected = DynamicUtil.getSelectedColumns(cc, columns);
-  
   final int matchingReporters = explorer.getMatchingReporters(dc);
   int reporterIndex = explorer.getReporterIndex();
@@ -133 +132 @@
     null : AnnotationType.getById(dc, annotationTypeId);
 
+  DynamicUtil.SelectedInfo selected = DynamicUtil.getSelectedColumns(cc, columns, isAveraging);
+  
+  if (isAveraging && cc.getSortProperty() != null)
+  {
+    // We must check that we are not sorting on a non-averagable property
+    List<String> sortProperties = Arrays.asList(cc.getSortProperty().split(","));
+    for (TableColumn tc : columns)
+    {
+      if (!tc.isAveragable()) sortProperties.remove(tc.getProperty());
+    }
+  }
+  
   AnnotationSummary summary = null;
-  
   if (matchingReporters > 0)
   {

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

@@ -101 +101 @@
   DynamicUtil.addRawDataColumns(columns, dc, rawDataType, "raw.", "$", "[Raw] ");
   DynamicUtil.addReporterColumns(columns, dc, "rep.", "@", "[Rep] ");
-  DynamicUtil.SelectedInfo selected = DynamicUtil.getSelectedColumns(cc, columns);
+  DynamicUtil.SelectedInfo selected = DynamicUtil.getSelectedColumns(cc, columns, false);
   if (bioAssay == null && cc.getSetting("columns").indexOf("COLUMN") >= 0) 
   {