RowCount control (also option) support

export/LightPivotTable-DeepSeePortlet.xml

@@ -286,6 +286,12 @@ If LPT has been created before, method fires given callback immidiately.</Descri
                             controller.setProperty("selectedRange", ss.join("\n"));
                         }
                     }
+                };
+                // widget controls processing
+                for (var c in info.controls) {
+                    if (info.controls[c].action === "setRowCount") {
+                        setup.rowCount = info.controls[c].value;
+                    }
                 }
                 // Getting filters from controller, if it has filters added from URL or default...
                 // such filters are marked as "transient"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "LightPivotTable",
   "author": "ZitRo",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
   "main": "test/testServer.js",
   "repository": {
@@ -28,7 +28,7 @@
     "pivot",
     "table",
     "data",
-    "collection",
+    "mdx",
     "visualization"
   ],
   "dependencies": {

readme.md

@@ -78,6 +78,7 @@ var setup = { // Object that contain settings. Properties in brackets can be mis
         [ , showRowNumbers: true ] // show the row number in first column
         [ , enableListingSelect: true ] // enable listing selection, true by default
         [ , showListingRowsNumber: true ] // show rows number in listing and tables if paginated
+        [ , rowCount: 5 ] // number of rows to show. Use lp.setRowCount(N) to change rowCount. Manual lp.refresh() needed to apply.
     },
     lp = new LightPivotTable(setup);
 
@@ -96,6 +97,7 @@ lp.changeBasicMDX("..."); // change mdx for LPT
 lp.getActualMDX(); // returns currently displayed MDX
 lp.getSelectedRows(); // returns array with selected rows indexes. First row have index 1.
 lp.attachTrigger("contentRendered", function (lpInstance) {  }); // attaches trigger during runtime
+lp.setRowCount(5); // sets the number of rows to display
 
 // Additional calls:
 lp.pivotView.getCellElement(x, y, considerHeaders); // returns cell element by given coordinates

source/js/DataSource.js

@@ -148,6 +148,10 @@ DataSource.prototype.getCurrentData = function (callback) {
         mdx = mdxParser.applyFilter(mdx, this.FILTERS[i]);
     }
 
+    if (typeof this.GLOBAL_CONFIG.rowCount === "number") {
+        mdx = mdxParser.applyRowCount(mdx, this.GLOBAL_CONFIG.rowCount);
+    }
+
     var setupPivotOptions = function () {
 
         var data = ready.pivotData;

source/js/LightPivotTable.js

@@ -86,6 +86,12 @@ LightPivotTable.prototype.changeBasicMDX = function (mdx) {
 
 };
 
+LightPivotTable.prototype.setRowCount = function (n) {
+
+    this.CONFIG.rowCount = n;
+
+};
+
 /**
  * Returns current mdx including filters.
  * @returns {string}
@@ -101,6 +107,10 @@ LightPivotTable.prototype.getActualMDX = function () {
         mdx = mdxParser.applyFilter(mdx, filters[i]);
     }
 
+    if (typeof this.CONFIG.rowCount === "number") {
+        mdx = mdxParser.applyRowCount(mdx, this.CONFIG.rowCount);
+    }
+
     return mdx;
 
 };

source/js/MDXParser.js

@@ -38,9 +38,22 @@ MDXParser.prototype.prependNonEmpty = function (expression) {
     return expression.match(/^\s*non\s+empty/i) ? expression : "NON EMPTY " + expression;
 };
 
+/**
+ * Applies Row Count to mdx.
+ * Source: SELECT [Test].Members ON 0, NON EMPTY      [Test2].Members     ON 1 FROM [Tests] %FILTER
+ * Out:    SELECT [Test].Members ON 0, NON EMPTY HEAD([Test2].Members, N) ON 1 FROM [Tests] %FILTER
+ * @param {string} expression - MDX expression.
+ * @param {number} n - Number of rows to return.
+ * @returns {string}
+ */
+MDXParser.prototype.applyRowCount = function (expression, n) {
+    return expression.replace(/\s*on\s*0\s*,\s*(?:non\s*empty\s*)?(.*)\s*on\s*1/i, function (a,b) {
+        return typeof n !== "undefined" ? " ON 0, NON EMPTY HEAD(" + b + ", " + n + ") ON 1" : a;
+    });
+};
+
 /**
  * Performs DrillDown on MDX query.
- *
  * @param {string} mdx
  * @param {string} filter
  * @param {string} [expression] - if is set, "* ON 1" will be replaced with "{value} ON 1"
@@ -49,8 +62,8 @@ MDXParser.prototype.prependNonEmpty = function (expression) {
 MDXParser.prototype.drillDown = function (mdx, filter, expression) {
 
     if (!filter) {
-        if (/]\s+ON\s+1/.test(mdx)) {
-            return mdx = mdx.replace(/]\s+ON\s+1/, "].children ON 1");
+        if (/]\s+ON\s+1/i.test(mdx)) {
+            return mdx = mdx.replace(/]\s+ON\s+1/i, "].children ON 1");
         } else {
             this._warnMDX(mdx, "no filter specified");
             return "";

source/js/PivotView.js

@@ -91,6 +91,7 @@ PivotView.prototype.init = function () {
         els = this.elements;
 
     els.base.className = "lpt";
+    els.base.setAttribute("LPTVersion", this.controller.VERSION);
     els.container.appendChild(els.base);
 
     this.pushTable();