Commit 4f2a2f3f authored by Romain Loth's avatar Romain Loth

[minor] clarify call to query_grouped_ngrams removing the deprecated parts

parent e6e627fa
...@@ -48,28 +48,19 @@ def query_grouped_ngrams(groupings_id, details=False, scoring_metric_id=None): ...@@ -48,28 +48,19 @@ def query_grouped_ngrams(groupings_id, details=False, scoring_metric_id=None):
Parameter: Parameter:
- details: if False, send just the array of ngram_ids - details: if False, send just the array of ngram_ids
if True, send triples with (ngram_id, term, scoring) if True, send couples with (ngram_id, term)
^^^^^^^
deprecated: scoring_metric_id: id of a scoring metric node (TFIDF or OCCS)
(for details and sorting)
(no more OCCS counts of subforms)
""" """
if not details: if not details:
# simple contents # simple contents
query = session.query(NodeNgramNgram.ngram2_id) query = session.query(NodeNgramNgram.ngram2_id)
else: else:
# detailed contents (terms and some NodeNodeNgram for score) # detailed contents (id + terms)
query = (session query = (session
.query( .query(
NodeNgramNgram.ngram2_id, NodeNgramNgram.ngram2_id,
Ngram.terms, Ngram.terms,
# NodeNodeNgram.score #
) )
.join(Ngram, NodeNgramNgram.ngram2_id == Ngram.id) .join(Ngram, NodeNgramNgram.ngram2_id == Ngram.id)
# .join(NodeNodeNgram, NodeNgramNgram.ngram2_id == NodeNodeNgram.ngram_id)
# .filter(NodeNodeNgram.node1_id == scoring_metric_id)
# .order_by(desc(NodeNodeNgram.score))
) )
# main filter # main filter
......
...@@ -614,8 +614,7 @@ class ListFamily(APIView): ...@@ -614,8 +614,7 @@ class ListFamily(APIView):
mainlist_query = query_list(mainlist_id, details=True, mainlist_query = query_list(mainlist_id, details=True,
scoring_metric_id= scores_id) scoring_metric_id= scores_id)
# infos for grouped ngrams, absent from mainlist # infos for grouped ngrams, absent from mainlist
hidden_ngrams_query = query_grouped_ngrams(groups_id, details=True, hidden_ngrams_query = query_grouped_ngrams(groups_id, details=True)
scoring_metric_id= scores_id)
# infos for stoplist terms, absent from mainlist # infos for stoplist terms, absent from mainlist
stop_ngrams_query = query_list(other_list_ids['stoplist'], details=True, stop_ngrams_query = query_list(other_list_ids['stoplist'], details=True,
......
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