Commit 389583e9 authored by Romain Loth's avatar Romain Loth

deactivate sending subform counts to term table (for now, subform counts don't exist anymore)

parent 1bb37aff
...@@ -74,8 +74,10 @@ def _query_grouped_ngrams(groupings_id, details=False, scoring_metric_id=None): ...@@ -74,8 +74,10 @@ def _query_grouped_ngrams(groupings_id, details=False, scoring_metric_id=None):
- 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 triples with (ngram_id, term, scoring)
^^^^^^^ ^^^^^^^
- scoring_metric_id: id of a scoring metric node (TFIDF or OCCS)
deprecated: scoring_metric_id: id of a scoring metric node (TFIDF or OCCS)
(for details and sorting) (for details and sorting)
(no more OCCS counts of subforms)
""" """
if not details: if not details:
# simple contents # simple contents
...@@ -86,12 +88,12 @@ def _query_grouped_ngrams(groupings_id, details=False, scoring_metric_id=None): ...@@ -86,12 +88,12 @@ def _query_grouped_ngrams(groupings_id, details=False, scoring_metric_id=None):
.query( .query(
NodeNgramNgram.ngram2_id, NodeNgramNgram.ngram2_id,
Ngram.terms, Ngram.terms,
NodeNodeNgram.score # NodeNodeNgram.score #
) )
.join(Ngram, NodeNgramNgram.ngram2_id == Ngram.id) .join(Ngram, NodeNgramNgram.ngram2_id == Ngram.id)
.join(NodeNodeNgram, NodeNgramNgram.ngram2_id == NodeNodeNgram.ngram_id) # .join(NodeNodeNgram, NodeNgramNgram.ngram2_id == NodeNodeNgram.ngram_id)
.filter(NodeNodeNgram.node1_id == scoring_metric_id) # .filter(NodeNodeNgram.node1_id == scoring_metric_id)
.order_by(desc(NodeNodeNgram.score)) # .order_by(desc(NodeNodeNgram.score))
) )
# main filter # main filter
......
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