Fix bug in conversion of query model to olap4j parse tree; the bug me…

…ant that queries would lose their slicer.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@93 c6a108a4-781c-0410-a6c6-c2d559e19af0

src/org/olap4j/query/Query.java

@@ -162,17 +162,22 @@ public SelectNode toOlap4j(Query query) {
  List<QueryAxis> axisList = new ArrayList<QueryAxis>();
  axisList.add(query.getAxes().get(Axis.COLUMNS));
  axisList.add(query.getAxes().get(Axis.ROWS));
-
+
+ AxisNode filterAxis = null;
+ if (query.getAxes().containsKey(Axis.FILTER)) {
+ final QueryAxis axis = query.getAxes().get(Axis.FILTER);
+ if (!axis.dimensions.isEmpty()) {
+ filterAxis = toOlap4j(axis);
+ }
+ }
  return new SelectNode(
  null,
  withList,
  toOlap4j(axisList),
  new CubeNode(
  null,
  query.getCube()),
- query.getAxes().containsKey(Axis.FILTER)
- ? null
- : toOlap4j(query.getAxes().get(Axis.FILTER)),
+ filterAxis,
  list);
  }