[UPDATE] show stop-list OK

rest_v1_0/ngrams.py

@@ -83,7 +83,8 @@ def get_occtfidf( ngrams , user_id , corpus_id , list_name):
     for ngram in nodes_ngrams:
         ngram_ids[ngram.id] = {
             "id": ngram.id,
-            "name": ngram.terms
+            "name": ngram.terms,
+            "scores": {}
         }
 
     # [ Get Uniq_Occs ]
@@ -103,12 +104,12 @@ def get_occtfidf( ngrams , user_id , corpus_id , list_name):
     OCCs = {}
     for ngram in ngrams_occs:
         try:
-            ngram_ids [ ngram[0] ][ "occ_uniq" ] = ngram[1]
+            ngram_ids [ ngram[0] ]["scores"][ "occ_uniq" ] = ngram[1]
         except:
             pass
     for i in ngram_ids:
-        if "occ_uniq" not in ngram_ids[i]:
-            ngram_ids[i][ "occ_uniq" ] = 1
+        if "occ_uniq" not in ngram_ids[i]["scores"]:
+            ngram_ids[i]["scores"][ "occ_uniq" ] = 1
 
     group_by = []
     results   = ['id', 'terms']
@@ -137,13 +138,13 @@ def get_occtfidf( ngrams , user_id , corpus_id , list_name):
                     )
     for ngram in ngrams_query:
         try:
-            ngram_ids [ ngram[0] ][ "tfidf" ] = ngram[2]
+            ngram_ids [ ngram[0] ]["scores"][ "tfidf" ] = ngram[2]
         except:
             pass
             
     for i in ngram_ids:
-        if "tfidf" not in ngram_ids[i]:
-            ngram_ids[i][ "tfidf" ] = 0.01
+        if "tfidf" not in ngram_ids[i]["scores"]:
+            ngram_ids[i]["scores"][ "tfidf" ] = 0.01
 
     return ngram_ids
 

static/js/NGrams_dyna_chart_and_table.js

@@ -891,17 +891,17 @@ function SearchFilters( elem ) {
   }
 
   if( MODE == "filter_stop-list") {
-
-  	if(Object.keys(NGrams["stop"]).length<1) {
+  	console.log( NGrams["stop"] )
+  	if(Object.keys(NGrams["stop"]).length>0) {
 		var sub_ngrams_data = {
 			"ngrams":[],
 			"scores": $.extend({}, NGrams["main"].scores)
 		}
-		for(var r in NGrams["main"].ngrams) {
-			if ( NGrams["stop"][ NGrams["main"].ngrams[r].id ] ) {
-				sub_ngrams_data["ngrams"].push( NGrams["main"].ngrams[r] )
-			}
+		for(var r in NGrams["stop"]) {
+			sub_ngrams_data["ngrams"].push( NGrams["stop"][r] )
 		}
+		var result = Main_test(sub_ngrams_data , NGrams["main"].scores.initial , MODE)
+		console.log( result )
   	}
   }