Commit aa3fbe2c authored by PkSM3's avatar PkSM3

[UPDATE] adjusts for GET list and scores

parent 296ae91d
...@@ -104,8 +104,11 @@ class Ngrams(APIView): ...@@ -104,8 +104,11 @@ class Ngrams(APIView):
.join(Node, Node.id == Node_Ngram.node_id) .join(Node, Node.id == Node_Ngram.node_id)
) )
the_score = "tfidf"
if request.GET.get('score', False) != False:
the_score = request.GET['score']
# get the scores # get the scores
if 'tfidf' in request.GET['score']: if 'tfidf' in the_score:
Tfidf = aliased(NodeNodeNgram) Tfidf = aliased(NodeNodeNgram)
tfidf_id = get_or_create_node(nodetype='Tfidf (global)', corpus=corpus).id tfidf_id = get_or_create_node(nodetype='Tfidf (global)', corpus=corpus).id
ngrams_query = (ngrams_query.add_column(Tfidf.score.label('tfidf')) ngrams_query = (ngrams_query.add_column(Tfidf.score.label('tfidf'))
...@@ -115,7 +118,7 @@ class Ngrams(APIView): ...@@ -115,7 +118,7 @@ class Ngrams(APIView):
group_by.append(Tfidf.score) group_by.append(Tfidf.score)
results.append('tfidf') results.append('tfidf')
if 'cvalue' in request.GET['score']: if 'cvalue' in the_score:
Cvalue = aliased(NodeNodeNgram) Cvalue = aliased(NodeNodeNgram)
cvalue_id = get_or_create_node(nodetype='Cvalue', corpus=corpus).id cvalue_id = get_or_create_node(nodetype='Cvalue', corpus=corpus).id
ngrams_query = (ngrams_query.add_column(Cvalue.score.label('cvalue')) ngrams_query = (ngrams_query.add_column(Cvalue.score.label('cvalue'))
...@@ -125,7 +128,7 @@ class Ngrams(APIView): ...@@ -125,7 +128,7 @@ class Ngrams(APIView):
group_by.append(Cvalue.score) group_by.append(Cvalue.score)
results.append('cvalue') results.append('cvalue')
if 'specificity' in request.GET['score']: if 'specificity' in the_score:
Spec = aliased(NodeNodeNgram) Spec = aliased(NodeNodeNgram)
spec_id = get_or_create_node(nodetype='Specificity', corpus=corpus).id spec_id = get_or_create_node(nodetype='Specificity', corpus=corpus).id
ngrams_query = (ngrams_query.add_column(Spec.score.label('specificity')) ngrams_query = (ngrams_query.add_column(Spec.score.label('specificity'))
......
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