Add Query.setNonEmpty/isNonEmpty (bug 1994488).

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

src/org/olap4j/query/Query.java

@@ -3,7 +3,7 @@
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
-// Copyright (C) 2007-2007 Julian Hyde
+// Copyright (C) 2007-2008 Julian Hyde
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.
 */
@@ -273,12 +273,11 @@ private AxisNode toOlap4j(QueryAxis axis) {
  }
  }
  return new AxisNode(
- null,
- false,
- axis.getLocation(),
- new ArrayList<IdentifierNode>(),
- callNode);
-
+ null,
+ axis.isNonEmpty(),
+ axis.getLocation(),
+ new ArrayList<IdentifierNode>(),
+ callNode);
  }
 
  private List<ParseTreeNode> toOlap4j(QueryDimension dimension) {

src/org/olap4j/query/QueryAxis.java

@@ -3,7 +3,7 @@
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
-// Copyright (C) 2007-2007 Julian Hyde
+// Copyright (C) 2007-2008 Julian Hyde
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.
 */
@@ -31,7 +31,14 @@ public class QueryAxis {
 
  private final Query query;
  protected Axis location = null;
+ private boolean nonEmpty;
 
+ /**
+ * Creates a QueryAxis.
+ *
+ * @param query Query that the axis belongs to
+ * @param location Location of axis (e.g. ROWS, COLUMNS)
+ */
  public QueryAxis(Query query, Axis location) {
  super();
  this.query = query;
@@ -63,10 +70,39 @@ public List<QueryDimension> getDimensions() {
  return dimensions;
  }
 
+ /**
+ * Returns the name of this QueryAxis.
+ *
+ * @return the name of this axis, for example "ROWS", "COLUMNS".
+ */
  public String getName() {
  return location.getCaption(query.getLocale());
  }
 
+ /**
+ * Returns whether this QueryAxis filters out empty rows.
+ * If true, axis filters out empty rows, and the MDX to evaluate the axis
+ * will be generated with the "NON EMPTY" expression.
+ *
+ * @return Whether this axis should filter out empty rows
+ *
+ * @see #setNonEmpty(boolean)
+ */
+ public boolean isNonEmpty() {
+ return nonEmpty;
+ }
+
+ /**
+ * Sets whether this QueryAxis filters out empty rows.
+ *
+ * @param nonEmpty Whether this axis should filter out empty rows
+ *
+ * @see #isNonEmpty()
+ */
+ public void setNonEmpty(boolean nonEmpty) {
+ this.nonEmpty = nonEmpty;
+ }
+
  /**
  * List of QueryDimension objects. The list is active: when a dimension
  * is added to the list, it is removed from its previous axis.

testsrc/org/olap4j/OlapTest.java

@@ -665,8 +665,11 @@ public static void resultsToXml(CellSet result, Document doc, Element parent) {
  }
  }
 
- public static void axisToXml(QueryAxis axis, Document doc, Element parent) {
-
+ public static void axisToXml(
+ QueryAxis axis,
+ Document doc,
+ Element parent)
+ {
  try {
  Element root = doc.createElement("axis");
  parent.appendChild(root);
@@ -685,6 +688,9 @@ public static void axisToXml(QueryAxis axis, Document doc, Element parent) {
  break;
  }
 
+ addAttribute(
+ "nonEmpty", Boolean.toString(axis.isNonEmpty()), parent);
+
  List<QueryDimension> dimensions = axis.getDimensions();
  for (QueryDimension dimension : dimensions) {
  dimensionSelectionsToXml(dimension, doc, dimensionsNode);