Fixes to the cube discovery for SAP BW <-> XML/A.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@326 c6a108a4-781c-0410-a6c6-c2d559e19af0
ps3331333 · Jul 20, 2010 · c4079d7 · c4079d7
1 parent 8f72d8b
commit c4079d7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
@@ -534,6 +534,9 @@ private XmlaOlap4jCube lookupCube(
  if (cubeName.equals(cube.getName())) {
  return (XmlaOlap4jCube) cube;
  }
+ if (cubeName.equals("[" + cube.getName() + "]")) {
+ return (XmlaOlap4jCube) cube;
+ }
  }
  }
  }

diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
@@ -1095,8 +1095,11 @@ public void handle(
  // so try to use the unique name instead
  final String hierarchyName =
  stringElement(row, "HIERARCHY_NAME") == null
- ? hierarchyUniqueName
- : stringElement(row, "HIERARCHY_NAME");
+ ? (hierarchyUniqueName != null
+ ? hierarchyUniqueName.replaceAll("^\\[", "")
+ .replaceAll("\\]$", "")
+ : null)
+ : stringElement(row, "HIERARCHY_NAME");
  final String hierarchyCaption =
  stringElement(row, "HIERARCHY_CAPTION");
  final String description =
@@ -1163,7 +1166,10 @@ public void handle(
  // so try to use the unique name instead
  final String levelName =
  stringElement(row, "LEVEL_NAME") == null
- ? levelUniqueName
+ ? (levelUniqueName != null
+ ? levelUniqueName.replaceAll("^\\[", "")
+ .replaceAll("\\]$", "")
+ : null)
  : stringElement(row, "LEVEL_NAME");
  final String levelCaption =
  stringElement(row, "LEVEL_CAPTION");