Changeset 4593

Timestamp:

Oct 21, 2008, 8:47:12 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1150: Incorrect mapping of BASE1/BASE2 differences by Base1PluginExecuter

Added missing functions, pos() and rep('id'), to the expression builder.

Location:

branches/2.8-stable

Files:

• src/clients/web/net/sf/basedb/clients/web/DynamicUtil.java (modified) (2 diffs)
• www/common/expression_builder.jsp (modified) (1 diff)

branches/2.8-stable/src/clients/web/net/sf/basedb/clients/web/DynamicUtil.java

@@ -72 +72 @@
     Formatter<Number> numberFormatter = FormatterFactory.getNumberFormatter(sc);
     Formatter<Number> intFormatter = FormatterFactory.getIntFormatter(sc);
-    columns.add(new TableColumn("POSITION", "POSITION", null, Type.INT, 
+    columns.add(new TableColumn("POSITION", "POSITION", "pos()", Type.INT, 
       "Position", "Spot position", "always", true, true, true, 
       Formula.AverageMethod.NONE, intFormatter));
@@ -132 +132 @@
     Formatter<String> stringFormatter = FormatterFactory.getStringFormatter(sc);
     Formatter<Date> dateFormatter = FormatterFactory.getDateFormatter(sc);
+    columns.add(new TableColumn(idPrefix + "id", propertyPrefix+"id", "rep('id')", 
+      Type.INT, titlePrefix + "Internal ID", "Reporter internal ID", "auto", true, true, true,
+      Formula.AverageMethod.NONE, null));
     columns.add(new TableColumn(idPrefix + "name", propertyPrefix+"name", "rep('name')", 
       Type.STRING, titlePrefix + "Name", "Reporter name", "auto", true, true, true, 
       Formula.AverageMethod.NONE, stringFormatter));
     columns.add(new TableColumn(idPrefix + "externalId", propertyPrefix+"externalId", "rep('externalId')", 
-      Type.STRING, titlePrefix + "ID", "Reporter ID", "auto", true, true, true, 
+      Type.STRING, titlePrefix + "External ID", "Reporter ID", "auto", true, true, true, 
       Formula.AverageMethod.NONE, stringFormatter));
     columns.add(new TableColumn(idPrefix + "symbol", propertyPrefix+"symbol", "rep('symbol')", 

branches/2.8-stable/www/common/expression_builder.jsp

@@ -265 +265 @@
       return channel;
     }
-    
+    function pos()
+    {
+      return Math.random() * 100;
+    }
     function rep(property)
     {