Always use custom generated MDX when performing drillthrough

Author: mysticfall

pivot4j-core/src/main/java/org/pivot4j/transform/impl/DrillThroughImpl.java

@@ -23,6 +23,7 @@
 import org.olap4j.OlapException;
 import org.olap4j.Position;
 import org.olap4j.metadata.Cube;
+import org.olap4j.metadata.Level;
 import org.olap4j.metadata.Member;
 import org.olap4j.metadata.MetadataElement;
 import org.pivot4j.PivotException;
@@ -75,12 +76,12 @@ public ResultSet drillThrough(Cell cell, List<MetadataElement> selection,
 
 		ResultSet result;
 
-		if (selection != null && !selection.isEmpty() || maximumRows > 0) {
-			result = performDrillThroughMdx(cell, selection, maximumRows);
-		} else {
-			result = performDrillThrough(cell);
+		if (selection==null) {
+			selection = Collections.emptyList();
 		}
 
+		result = performDrillThroughMdx(cell, selection, maximumRows);
+
 		return result;
 	}
 
@@ -158,15 +159,17 @@ protected ResultSet performDrillThroughMdx(Cell cell,
 			builder.append(slicer.toMdx());
 		}
 
-		List<Member> members;
+		List<MetadataElement> members;
 		if (selection == null) {
 			members = Collections.emptyList();
 		} else {
-			members = new LinkedList<Member>();
+			members = new LinkedList<MetadataElement>();
 
 			for (MetadataElement elem : selection) {
-				if (elem instanceof Member) {
-					members.add((Member) elem);
+				if (elem instanceof Member){
+					members.add(utils.wrapRaggedIfNecessary((Member) elem));
+				} else if (elem instanceof Level) {
+					members.add(elem);
 				}
 			}
 		}
@@ -176,15 +179,13 @@ protected ResultSet performDrillThroughMdx(Cell cell,
 
 			isFirst = true;
 
-			for (Member elem : members) {
+			for (MetadataElement elem : members) {
 				if (isFirst) {
 					isFirst = false;
 				} else {
 					builder.append(", ");
 				}
 
-				elem = utils.wrapRaggedIfNecessary(elem);
-
 				builder.append(elem.getUniqueName());
 			}
 		}