fixed mdx querying mechanism (mdx type recognition)

Author: nikitaeverywhere

source/js/DataSource.js

@@ -26,8 +26,6 @@ var DataSource = function (config, globalConfig, lpt) {
      */
     this.DATA_SOURCE_PIVOT = config["pivot"] || "";
 
-    this.ACTION = config.action || "MDX";
-
     this.FILTERS = [];
 
     this.BASIC_FILTERS = [];
@@ -120,6 +118,7 @@ DataSource.prototype.getCurrentData = function (callback) {
         __ = this._convert,
         mdx = this.BASIC_MDX,
         mdxParser = new MDXParser(),
+        mdxType = mdxParser.mdxType(mdx),
         ready = {
             state: 0,
             data: {},
@@ -164,8 +163,7 @@ DataSource.prototype.getCurrentData = function (callback) {
 
         //console.log("Retrieved data:", ready);
 
-        (data.Info || {}).action = _.ACTION;
-        if (_.ACTION === "MDXDrillthrough") {
+        if (mdxType === "drillthrough") {
             callback((function (data) {
 
                 var arr = data["children"] || [],
@@ -189,8 +187,7 @@ DataSource.prototype.getCurrentData = function (callback) {
                         cubeName: "No cube name",
                         leftHeaderColumnsNumber: 0,
                         rowCount: arr.length,
-                        topHeaderRowsNumber: headers.length,
-                        action: _.ACTION
+                        topHeaderRowsNumber: headers.length
                     }
                 };
 
@@ -203,11 +200,10 @@ DataSource.prototype.getCurrentData = function (callback) {
                 return __(obj);
 
             })(data));
-        } else if (_.ACTION = "MDX") {
+        } else if (mdxType === "mdx") {
             callback(_._convert(data));
         } else {
-            console.error("Not implemented URL action: " + _.ACTION);
-            callback({ error: "Not implemented URL action: " + data || true });
+            callback({ error: "Unrecognised MDX: " + mdx || true });
         }
 
     };
@@ -222,7 +218,11 @@ DataSource.prototype.getCurrentData = function (callback) {
 
         console.log("LPT MDX request:", mdx);
 
-        _._post(_.SOURCE_URL + "/" + _.ACTION + (_.NAMESPACE ? "?Namespace=" + _.NAMESPACE : ""), {
+        _._post(
+            _.SOURCE_URL + "/" +
+            (mdxType === "drillthrough" ? "MDXDrillthrough" : "MDX")
+            + (_.NAMESPACE ? "?Namespace=" + _.NAMESPACE : ""
+        ), {
             MDX: mdx
         }, function (data) {
             _.LPT.pivotView.removeMessage();

source/js/LightPivotTable.js

@@ -195,7 +195,6 @@ LightPivotTable.prototype.tryDrillThrough = function (filters) {
 
     // clone dataSource config object
     for (var i in _.CONFIG.dataSource) { ds[i] = _.CONFIG.dataSource[i]; }
-    ds.action = "MDXDrillthrough";
 
     ds.basicMDX = this.mdxParser.drillThrough(this.dataSource.BASIC_MDX, filters)
         || this.dataSource.basicMDX;

source/js/MDXParser.js

@@ -1,8 +1,10 @@
-var MDXParser = function () {
-
-
-
-};
+/**
+ * MDX parser.
+ *
+ * @author ZitRo
+ * @constructor
+ */
+var MDXParser = function () {};
 
 /**
  * Debug method.
@@ -95,6 +97,27 @@ MDXParser.prototype.drillThrough = function (basicMDX, filters) {
 
 };
 
+/**
+ * Returns type of MDX.
+ *
+ * @param {string} mdx
+ */
+MDXParser.prototype.mdxType = function (mdx) {
+
+    var m = mdx.toLowerCase(),
+        dt = m.indexOf("drillthrough"),
+        dd = m.indexOf("select");
+
+    if (dt > -1) {
+        return "drillthrough";
+    } else if (dd > -1) {
+        return "mdx";
+    } else {
+        return "unknown";
+    }
+
+};
+
 /**
  * @param {string} basicMDX
  * @param {string} filterSpec

source/js/PivotView.js

@@ -451,7 +451,7 @@ PivotView.prototype.recalculateSizes = function (container) {
         containerParent.appendChild(container); // attach
 
     } catch (e) {
-        console.error("Error when fixing sizes. Please, contact the developer.", "ERROR:", e);
+        console.error("Error when fixing sizes.", "ERROR:", e);
     }
 
 };
@@ -594,6 +594,12 @@ PivotView.prototype.renderRawData = function (data) {
             _._backClickHandler.call(_, e);
         });
     }
+    if ( // hide unnesesarry column
+        (this.controller.CONFIG["hideButtons"] || this.tablesStack.length < 2)
+        && info.leftHeaderColumnsNumber === 0
+    ) {
+        header.style.display = "none";
+    }
 
     // render topHeader
     renderHeader(
@@ -611,10 +617,7 @@ PivotView.prototype.renderRawData = function (data) {
         info.topHeaderRowsNumber,
         rawData.length,
         LHTHead
-    );
-    if (this.controller.CONFIG["hideButtons"] && info.leftHeaderColumnsNumber === 0) {
-        header.style.display = "none";
-    }
+    )
 
     // render table
     for (y = info.topHeaderRowsNumber; y < rawData.length; y++) {