[CODE] The API is now wrapped in a controller.

NgramsCache: ngrams are now stored in lowercase

gargantext_web/api.py

@@ -27,7 +27,10 @@ _ngrams_order_columns = {
 }
 
 
-def corpus_ngrams(request, corpus_id):
+class CorpusController:
+
+    @staticmethod
+    def ngrams(request, corpus_id):
         # parameters retrieval and control
         corpusQuery = Node.objects.filter(id = corpus_id)
         if not corpusQuery:
@@ -55,7 +58,8 @@ def corpus_ngrams(request, corpus_id):
             "list" : [ngram.terms for ngram in ngramsQuery],
         })
 
-def corpus_metadata(request, corpus_id):
+    @staticmethod
+    def metadata(request, corpus_id):
         # parameters retrieval and control
         corpusQuery = Node.objects.filter(id = corpus_id)
         if not corpusQuery:
@@ -83,12 +87,8 @@ def corpus_metadata(request, corpus_id):
             "list" : [row[0] for row in cursor.fetchall()],
         })
         
-
-# ?mesured=documents.count
-# &parameters[]=metadata.publication_year
-# &filter[]=ngrams.in.test,ht,grf
-
-def corpus_data(request, corpus_id):
+    @staticmethod
+    def data(request, corpus_id):
         # parameters retrieval and control
         corpusQuery = Node.objects.filter(id = corpus_id)
         if not corpusQuery:

gargantext_web/urls.py

@@ -40,9 +40,9 @@ urlpatterns = patterns('',
     url(r'^chart/corpus/(\d+)/data.csv$', send_csv),
     url(r'^graph.json$', send_graph),
 
-    url(r'^api/corpus/(\d+)/ngrams$', gargantext_web.api.corpus_ngrams),
-    url(r'^api/corpus/(\d+)/metadata$', gargantext_web.api.corpus_metadata),
-    url(r'^api/corpus/(\d+)/data$', gargantext_web.api.corpus_data),
+    url(r'^api/corpus/(\d+)/ngrams$', gargantext_web.api.CorpusController.ngrams),
+    url(r'^api/corpus/(\d+)/metadata$', gargantext_web.api.CorpusController.metadata),
+    url(r'^api/corpus/(\d+)/data$', gargantext_web.api.CorpusController.data),
 )
 
 from django.conf import settings

parsing/Caches.py

@@ -16,6 +16,7 @@ class NgramsCache(defaultdict):
     def __missing__(self, terms):
         """If the terms are not yet present in the dictionary,
         retrieve it from the database or insert it."""
+        terms = terms.strip().lower()
         try:
             ngram = node.models.Ngram.get(terms=terms, language=self.language)
         except: