Commit 70dbf3f1 authored by delanoe's avatar delanoe

[FEAT ANALYTICS HISTORIES] Fix concat corpora + filter parameters.

parent 50012500
...@@ -127,7 +127,7 @@ class NodeNgramsQueries(APIView): ...@@ -127,7 +127,7 @@ class NodeNgramsQueries(APIView):
}, },
# 'format': 'csv', # 'format': 'csv',
} }
print(input)
# input validation # input validation
input = validate(input, {'type': dict, 'default': {}, 'items': { input = validate(input, {'type': dict, 'default': {}, 'items': {
'x': {'type': dict, 'default': {}, 'items': { 'x': {'type': dict, 'default': {}, 'items': {
...@@ -363,17 +363,17 @@ def get_metadata(corpus_id_list): ...@@ -363,17 +363,17 @@ def get_metadata(corpus_id_list):
values_count = None values_count = None
values_from = None values_from = None
values_to = None values_to = None
if hyperdata != 'text': # if hyperdata == 'text':
node_hyperdata_query = (session # node_hyperdata_query = (session
.query(NodeHyperdata.key) # .query(NodeHyperdata.key)
.join(Node, Node.id == NodeHyperdata.node_id) # .join(Node, Node.id == NodeHyperdata.node_id)
.filter(Node.parent_id.in_(corpus_id_list)) # .filter(Node.parent_id.in_(corpus_id_list))
.filter(NodeHyperdata.key == hyperdata) # .filter(NodeHyperdata.key == hyperdata)
.group_by(NodeHyperdata.key) # .group_by(NodeHyperdata.key)
.order_by(NodeHyperdata.key) # .order_by(NodeHyperdata.key)
) # )
values_count = node_hyperdata_query.count() # values_count = node_hyperdata_query.count()
# values_count, values_from, values_to = node_hyperdata_query.first() # # values_count, values_from, values_to = node_hyperdata_query.first()
# if there is less than 32 values, retrieve them # if there is less than 32 values, retrieve them
values = None values = None
......
...@@ -336,7 +336,11 @@ gargantext.controller('DatasetController', function($scope, $http) { ...@@ -336,7 +336,11 @@ gargantext.controller('DatasetController', function($scope, $http) {
} }
// filter : corpora // filter : corpora
parameters.filter.corpora = []; parameters.filter.corpora = [];
parameters.filter.corpora.push(getSelectedCorporaIdList().join(',')); corpus_ids = getSelectedCorporaIdList() ;
for (i in corpus_ids) {
console.log(corpus_ids);
parameters.filter.corpora.push(corpus_ids[i]);
}
// filter: hyperdata // filter: hyperdata
parameters.filter.hyperdata = []; parameters.filter.hyperdata = [];
$.each($scope.hyperdataList, function(h, hyperdata) { $.each($scope.hyperdataList, function(h, hyperdata) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment