Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
humanities
gargantext
Commits
0f3ecfc8
Commit
0f3ecfc8
authored
Sep 25, 2017
by
sim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX] Quick fix: ngrams indexation at start of recount
parent
61f34558
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
main.py
gargantext/util/toolchain/main.py
+15
-2
No files found.
gargantext/util/toolchain/main.py
View file @
0f3ecfc8
...
@@ -62,12 +62,12 @@ def parse_extract_indexhyperdata(corpus):
...
@@ -62,12 +62,12 @@ def parse_extract_indexhyperdata(corpus):
# apply actions
# apply actions
print
(
'CORPUS #
%
d'
%
(
corpus
.
id
))
print
(
'CORPUS #
%
d'
%
(
corpus
.
id
))
corpus
.
status
(
'Docs'
,
progress
=
1
)
corpus
.
status
(
'Docs'
,
progress
=
1
)
corpus
.
save_hyperdata
()
corpus
.
save_hyperdata
()
session
.
commit
()
session
.
commit
()
parse
(
corpus
)
parse
(
corpus
)
docs
=
corpus
.
children
(
"DOCUMENT"
)
.
count
()
docs
=
corpus
.
children
(
"DOCUMENT"
)
.
count
()
print
(
'CORPUS #
%
d: parsed
%
d'
%
(
corpus
.
id
,
docs
))
print
(
'CORPUS #
%
d: parsed
%
d'
%
(
corpus
.
id
,
docs
))
extract_ngrams
(
corpus
)
extract_ngrams
(
corpus
)
...
@@ -242,6 +242,19 @@ def recount(corpus_id):
...
@@ -242,6 +242,19 @@ def recount(corpus_id):
corpus
.
save_hyperdata
()
corpus
.
save_hyperdata
()
session
.
commit
()
session
.
commit
()
# START OF KLUDGE...
from
gargantext.models
import
NodeNgram
,
DocumentNode
from
.ngrams_addition
import
index_new_ngrams
maplist_id
=
corpus
.
children
(
"MAPLIST"
)
.
first
()
.
id
ngram_ids
=
session
.
query
(
NodeNgram
.
ngram_id
.
distinct
())
indexed_ngrams
=
ngram_ids
.
join
(
DocumentNode
)
.
filter
(
DocumentNode
.
parent_id
==
corpus
.
id
)
not_indexed_ngrams
=
ngram_ids
.
filter
(
NodeNgram
.
node_id
==
maplist_id
,
~
NodeNgram
.
ngram_id
.
in_
(
indexed_ngrams
))
not_indexed_ngrams
=
[
x
[
0
]
for
x
in
not_indexed_ngrams
]
added
=
index_new_ngrams
(
not_indexed_ngrams
,
corpus
)
print
(
'RECOUNT #
%
d: [
%
s] indexed
%
s ngrams'
%
(
corpus
.
id
,
t
(),
added
))
# ...END OF KLUDGE
# -> overwrite occurrences (=> NodeNodeNgram)
# -> overwrite occurrences (=> NodeNodeNgram)
occ_id
=
compute_occs
(
corpus
,
occ_id
=
compute_occs
(
corpus
,
groupings_id
=
group_id
,
groupings_id
=
group_id
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment