Changeset 5148

Timestamp:

Oct 20, 2009, 2:35:27 PM (12 years ago)

Author:

Martin Svensson

Message:

Fixes #1410 Sort problem in EExplorer when Avg

File:

• trunk/src/clients/web/net/sf/basedb/clients/web/ExperimentExplorer.java (modified) (1 diff)

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

@@ -877 +877 @@
         {
           // Find TableColumn to know which average method to use
-          boolean found = false;
-          for (TableColumn tc : selectionList)
+          if (!sortProperty.startsWith("%"))
           {
-            if (sortProperty.equals(tc.getProperty()))
+            boolean found = false;          
+            for (TableColumn tc : selectionList)
             {
-              sortby = tc.getAverageMethod().getAverageExpression(sortby);
-              found = true;
-              break;
+              if (sortProperty.equals(tc.getProperty()))
+              {
+                sortby = tc.getAverageMethod().getAverageExpression(sortby);
+                found = true;
+                break;
+              }
             }
+            if (!found) sortby = null;
+          }       
+          else
+          {
+            sortby = avgMethod.getAverageExpression(sortby);
           }
-          if (!found) sortby = null;
         }
         if (sortby != null)