Merge branch 'testing' into stable

annotations/urls.py

-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from annotations import views
 
 

gargantext/constants.py

@@ -184,7 +184,7 @@ def get_tagger(lang):
 
 
 RESOURCETYPES = [
-    {   "type":1,
+    {   "type": 1,
         'name': 'Europresse',
         'format': 'Europresse',
         'parser': "EuropresseParser",
@@ -205,14 +205,14 @@ RESOURCETYPES = [
         'file_formats':["zip", "xml"],
         'crawler': "PubmedCrawler",
     },
-    {   'type':4,
+    {   'type': 4,
         'name': 'Scopus [RIS]',
         'format': 'RIS',
         'parser': "RISParser",
         'file_formats':["zip", "txt"],
         'crawler': None,
     },
-    {   'type':5,
+    {   'type': 5,
         'name': 'Web of Science [ISI]',
         'format': 'ISI',
         'parser': "ISIParser",
@@ -220,14 +220,14 @@ RESOURCETYPES = [
         #'crawler': "ISICrawler",
         'crawler': None,
     },
-    {   'type':6,
+    {   'type': 6,
         'name': 'Zotero [RIS]',
         'format': 'RIS',
         'parser': 'RISParser',
         'file_formats':["zip", "ris", "txt"],
         'crawler': None,
     },
-    {   'type':7,
+    {   'type': 7,
         'name': 'CSV',
         'format': 'CSV',
         'parser': 'CSVParser',
@@ -241,14 +241,14 @@ RESOURCETYPES = [
         'file_formats':["zip", "txt"],
         'crawler': None,
     },
-   {    "type":9,
+   {    "type": 9,
         "name": 'SCOAP [XML]',
         "parser": "CernParser",
         "format": 'MARC21',
         'file_formats':["zip","xml"],
         "crawler": "CernCrawler",
    },
-   {    "type":10,
+   {    "type": 10,
         "name": 'REPEC [RIS]',
         "parser": "RISParser",
         "format": 'RIS',

gargantext/util/parsers/ISTEX.py

@@ -23,7 +23,7 @@ class ISTexParser(Parser):
             "abstract"  : 'abstract',
             # "authors"           : 'author',
             "authorsRAW"        : 'author',
-            "keywords"          : "keywords"
+            #"keywords"          : "keywords"
         }
 
         suma = 0

graph/graph.py

@@ -82,7 +82,7 @@ def compute_graph( corpus_id=None      , cooc_id=None
 
         print("GRAPH #%d ... Notify by email owner of the graph." % cooc_id)
         corpus = session.query(Node).filter(Node.id==corpus_id).first()
-        notify_owner(corpus, cooc_id, distance, bridgeness)
+        #notify_owner(corpus, cooc_id, distance, bridgeness)
 
         print("GRAPH #%d ... Returning data as json." % cooc_id)
         return data

graph/urls.py

-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 # Module "Graph Explorer"
 from graph.rest         import Graph

templates/pages/menu.html

@@ -367,7 +367,7 @@
             <p>
                 Gargantext
                 <span class="glyphicon glyphicon-registration-mark" aria-hidden="true"></span>
-                , version 3.0.6.4,
+                , version 3.0.6.5,
                 <a href="http://www.cnrs.fr" target="blank" title="Institution that enables this project.">
                     Copyrights
                     <span class="glyphicon glyphicon-copyright-mark" aria-hidden="true"></span>