Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS

Luigi Serra
2 parents 736f8317 75918d56
Showing 2 changed files with 18 additions and 5 deletions
controllets/dataset-selection-controllet/dataset-selection-controllet.html
datalets/datasetexplorer-datalet/js/buildtreemap2.js
@@ -305,7 +305,7 @@
                     $("#info_s_dataset")[0].setAttribute("disabled", "true");
                 }
-                this.dataUrl = e.detail.url;
+                this.dataUrl = this._addlimitUrl(e.detail.url);
                 this.selected=0;
             },
@@ -318,7 +318,7 @@
                 var dataset = this.filteredDatasets[parseInt(e.target.id)]
-                this.dataUrl = dataset.url;
+                this.dataUrl = this._addlimitUrl(dataset.url);
                 if(dataset.description != ""){
                     $("#info_dataset")[0].removeAttribute("disabled");
@@ -336,7 +336,7 @@
                 var dataset = this.suggestedDatasets[parseInt(e.target.id)]
-                this.dataUrl = dataset.url;
+                this.dataUrl = this._addlimitUrl(dataset.url);
                 if(dataset.description != ""){
                     $("#info_s_dataset")[0].removeAttribute("disabled");
@@ -363,6 +363,19 @@
                 this.fire('dataset-selection-controllet_data-url', {url: this.dataUrl});
             },
+            _addlimitUrl : function(url){
+                //CKAN --> action no limit
+                if((url.indexOf("api/action") > -1) && !(url.indexOf("limit") > -1))
+                {
+                    url += "&limit=99999";
+                }
+                //OpenDataSoft --> action no limit
+                if((url.indexOf("api/records") > -1) && !(url.indexOf("rows") > -1)){
+                    url += "&rows=10000";
+                }
+                return url;
+            },
+
             _resize : function(){
                 var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - 16;
                 h = h - 64 - 8; //height with page scroller
@@ -50,7 +50,6 @@ function build2(root, meta, place_holder, select_listener, width, height) {
             var data = ["top", "", "#000000", "", "", "", ""];
             //data[3] = OW.getLanguageText('ode', 'back');
             data[3] = datasetexplorer_ln["ode+back_"+datasetexplorer_ln["ln"]];
-            console.log(data[3]);
             return "showTooltip(evt, '" + data + "')";
         })
@@ -80,7 +79,7 @@ function build2(root, meta, place_holder, select_listener, width, height) {
     // the children being overwritten when when layout is computed.
     function accumulate(d) {
         return (d._children = d.children)
-            ? d.value = d.children.reduce(function(p, v) { return p + accumulate(v); }, 5)
+            ? d.value = d.children.reduce(function(p, v) { return p + accumulate(v); }, 0)
             : d.value;
     }
@@ -141,6 +140,7 @@ function build2(root, meta, place_holder, select_listener, width, height) {
             .attr("onmousemove", function(d) {
                 //var data = ["lvl", "name", "color", "description", "logoUrl", "datasets", "datasetUrl"];
                 var data = ["", d.name, d.color, "", "", d.value, ""];
+                console.log(d);
                 data[2] = ["#000000"];
                 var id = d.name.split(':')[1];
                 if (d.depth == 1) {