Commit fa95e840 authored by delanoe's avatar delanoe

Merge branch 'testing' into stable

parents 636b1c96 2f24d6a8
......@@ -2,8 +2,10 @@
* Guided Tour
* Sources form highlighting crawlers
## Version 3.0.6.3
## Version 3.0.6.4
* COOC SQL improved
## Version 3.0.6.3
* New buttons
* Big graphs with conditional distance
......
......@@ -9,8 +9,8 @@ from .list_stop import do_stoplist
from .ngram_groups import compute_groups
from .metric_tfidf import compute_occs, compute_tfidf_local, compute_ti_ranking
from .list_main import do_mainlist
#from .ngram_coocs import compute_coocs
from .ngram_coocs_old_sqlalchemy_version import compute_coocs
from .ngram_coocs import compute_coocs
#from .ngram_coocs_old_sqlalchemy_version import compute_coocs
from .metric_specgen import compute_specgen
from .list_map import do_maplist
from .mail_notification import notify_owner
......
......@@ -173,7 +173,7 @@ def compute_coocs( corpus,
-- \--> adding (joining) ngrams that are grouped
LEFT JOIN nodes_ngrams
AS wlAA ON grA.ngram2_id = wlAA.ngram_id
AND wlA.node_id = wlA.node_id
AND wlAA.node_id = wlA.node_id
-- \--> adding (joining) ngrams that are not grouped
--LEFT JOIN ngrams AS wlAA ON grA.ngram2_id = wlAA.id
-- \--> for joining all synonyms even if they are not in the main list (white list)
......@@ -187,7 +187,7 @@ def compute_coocs( corpus,
-- \--> adding (joining) ngrams that are grouped
LEFT JOIN nodes_ngrams
AS wlBB ON grB.ngram2_id = wlBB.ngram_id
AND wlB.node_id = wlB.node_id
AND wlBB.node_id = wlB.node_id
-- \--> adding (joining) ngrams that are not grouped
-- LEFT JOIN ngrams AS wlBB ON grB.ngram2_id = wlBB.id
......
......@@ -367,7 +367,7 @@
<p>
Gargantext
<span class="glyphicon glyphicon-registration-mark" aria-hidden="true"></span>
, version 3.0.6.3,
, version 3.0.6.4,
<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>
......
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