Fix issue Relative time periods are not calculated correctly.

eclipse-birt · Jul 22, 2014 · ef801ad · ef801ad
1 parent c5a0385
commit ef801ad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...a/src/org/eclipse/birt/data/engine/olap/data/impl/aggregation/TimeFunctionCalculator.java b/...a/src/org/eclipse/birt/data/engine/olap/data/impl/aggregation/TimeFunctionCalculator.java
@@ -131,7 +131,10 @@ public class TimeFunctionCalculator
 		}
 		if( existReferenceDate )
 		{
-			endLevelIndex = cubeDimensionReader.getlowestLevelIndex( tDimName ) - 1;
+			if ( cubeDimensionReader.getlowestLevelIndex( tDimName ) == 0 )
+				endLevelIndex = 0;
+			else
+				endLevelIndex = cubeDimensionReader.getlowestLevelIndex( tDimName ) - 1;
 		}
 		else
 		{

diff --git a/.../src/org/eclipse/birt/data/engine/olap/data/impl/aggregation/function/TimeMemberUtil.java b/.../src/org/eclipse/birt/data/engine/olap/data/impl/aggregation/function/TimeMemberUtil.java
@@ -58,8 +58,13 @@ public static TimeMember toMember( IDimension timeDimension, Date referenceDate,
 	{
 		ILevel[] levels = timeDimension.getHierarchy( ).getLevels();
 		String[] levelType = null;
-		if( referenceDate != null )
-			levelType = new String[levels.length - 1];
+		if ( referenceDate != null )
+		{
+			if ( levels.length > 1 )
+				levelType = new String[levels.length - 1];
+			else
+				levelType = new String[levels.length];
+		}
 		else
 		{
 			levelType = new String[getLowestLevelIndex(timeDimension, cellTimeMember)+1];