MONDRIAN: Integrating change #13000, fix for MONDRIAN-565, hierarchy …

…captions were defaulting to the dimension name instead of the hierarchy name [git-p4: depot-paths = "//open/mondrian-release/3.1/": change = 13001]
pentaho · Aug 13, 2009 · 3e14c3b · 3e14c3b
1 parent d71c597
commit 3e14c3b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/main/mondrian/olap/HierarchyBase.java b/src/main/mondrian/olap/HierarchyBase.java
@@ -57,7 +57,11 @@ protected HierarchyBase(
     {
         this.dimension = dimension;
         this.hasAll = hasAll;
-        this.caption = dimension.getCaption();
+        if (subName == null) {
+            this.caption = dimension.getCaption();
+        } else {
+            this.caption = subName;
+        }
 
         String name = dimension.getName();
         if (MondrianProperties.instance().SsasCompatibleNaming.get()) {

diff --git a/testsrc/main/mondrian/xmla/XmlaBasicTest.ref.xml b/testsrc/main/mondrian/xmla/XmlaBasicTest.ref.xml
@@ -7688,7 +7688,7 @@ xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
                         <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>
                         <HIERARCHY_NAME>Weekly</HIERARCHY_NAME>
                         <HIERARCHY_UNIQUE_NAME>[Time].[Weekly]</HIERARCHY_UNIQUE_NAME>
-                        <HIERARCHY_CAPTION>Time</HIERARCHY_CAPTION>
+                        <HIERARCHY_CAPTION>Weekly</HIERARCHY_CAPTION>
                         <DIMENSION_TYPE>1</DIMENSION_TYPE>
                         <HIERARCHY_CARDINALITY>837</HIERARCHY_CARDINALITY>
                         <DEFAULT_MEMBER>[Time].[Weekly].[All Weeklys]</DEFAULT_MEMBER>

diff --git a/testsrc/main/mondrian/xmla/XmlaExcel2000Test.ref.xml b/testsrc/main/mondrian/xmla/XmlaExcel2000Test.ref.xml
@@ -1806,7 +1806,7 @@ The default value for this property is an empty string.</PropertyDescription>
                         <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>
                         <HIERARCHY_NAME>Weekly</HIERARCHY_NAME>
                         <HIERARCHY_UNIQUE_NAME>[Time].[Weekly]</HIERARCHY_UNIQUE_NAME>
-                        <HIERARCHY_CAPTION>Time</HIERARCHY_CAPTION>
+                        <HIERARCHY_CAPTION>Weekly</HIERARCHY_CAPTION>
                         <DIMENSION_TYPE>1</DIMENSION_TYPE>
                         <HIERARCHY_CARDINALITY>837</HIERARCHY_CARDINALITY>
                         <DEFAULT_MEMBER>[Time].[Weekly].[All Weeklys]</DEFAULT_MEMBER>

diff --git a/testsrc/main/mondrian/xmla/test/XmlaTest.ref.xml b/testsrc/main/mondrian/xmla/test/XmlaTest.ref.xml
@@ -1236,7 +1236,7 @@
         <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>
         <HIERARCHY_NAME>Weekly</HIERARCHY_NAME>
         <HIERARCHY_UNIQUE_NAME>[Time].[Weekly]</HIERARCHY_UNIQUE_NAME>
-        <HIERARCHY_CAPTION>Time</HIERARCHY_CAPTION>
+        <HIERARCHY_CAPTION>Weekly</HIERARCHY_CAPTION>
         <DIMENSION_TYPE>1</DIMENSION_TYPE>
         <HIERARCHY_CARDINALITY>837</HIERARCHY_CARDINALITY>
         <DEFAULT_MEMBER>[Time].[Weekly].[All Weeklys]</DEFAULT_MEMBER>
@@ -1591,7 +1591,7 @@
         <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>
         <HIERARCHY_NAME>Weekly</HIERARCHY_NAME>
         <HIERARCHY_UNIQUE_NAME>[Time].[Weekly]</HIERARCHY_UNIQUE_NAME>
-        <HIERARCHY_CAPTION>Time</HIERARCHY_CAPTION>
+        <HIERARCHY_CAPTION>Weekly</HIERARCHY_CAPTION>
         <DIMENSION_TYPE>1</DIMENSION_TYPE>
         <HIERARCHY_CARDINALITY>837</HIERARCHY_CARDINALITY>
         <DEFAULT_MEMBER>[Time].[Weekly].[All Weeklys]</DEFAULT_MEMBER>