summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaniel.cui2011-10-27 06:06:50 (EDT)
committer mwu@actuate.com2011-10-27 06:06:50 (EDT)
commitfbb9434baaf29b5834a3ca6d6339950560f87c6c (patch)
tree62fd45f72f84eb2dcb5731a19e4396e5ba6ebcea
parent2f2bd4c7ba06bd10cf7be9bd5f9f902febf172cc (diff)
downloadorg.eclipse.birt-fbb9434baaf29b5834a3ca6d6339950560f87c6c.zip
org.eclipse.birt-fbb9434baaf29b5834a3ca6d6339950560f87c6c.tar.gz
org.eclipse.birt-fbb9434baaf29b5834a3ca6d6339950560f87c6c.tar.bz2
Summary:
Add filter on date computed measure return no data Description of Issue: The data type information for "10/20/2012" have not be recognized, so it compared two string type. Description of Resolution: Change the data type for "10/20/2012" to Date type. Bugzilla/TED Entry(ies) Resolved: Regression (Yes/No): No Code Owner Team: DtE Code Reviewers: Mingxia Wu Project ID: 1425 Manual Tests Description: Automated Test Cases Executed: None. Special Notes: None. Files Edited: org.eclipse.birt.data.engine.olap.util.IJSObjectPopulator Files Added: None. Files Deleted: None.
-rw-r--r--data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/IJSObjectPopulator.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/IJSObjectPopulator.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/IJSObjectPopulator.java
index 05e91be..1d22c46 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/IJSObjectPopulator.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/util/IJSObjectPopulator.java
@@ -15,6 +15,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.eclipse.birt.core.data.DataTypeUtil;
import org.eclipse.birt.core.exception.BirtException;
import org.eclipse.birt.core.script.ScriptContext;
import org.eclipse.birt.core.script.ScriptExpression;
@@ -515,6 +516,9 @@ public interface IJSObjectPopulator
{
return ((Scriptable)result).getDefaultValue( null );
}
+
+ result = DataTypeUtil.convert( result, binding.getDataType( ) );
+
return result;
}
}
@@ -522,6 +526,10 @@ public interface IJSObjectPopulator
{
return e;
}
+ catch (BirtException e)
+ {
+ return e;
+ }
}
else
return null;