Commit 65d5ecd5 authored by PkSM3's avatar PkSM3

[BUGFIX] again, pubmed workflow_mov

parent 856ffe4b
...@@ -321,15 +321,18 @@ class Node(CTENode): ...@@ -321,15 +321,18 @@ class Node(CTENode):
language = langages_cache[metadata_values['language_iso2']] if 'language_iso2' in metadata_values else None, language = langages_cache[metadata_values['language_iso2']] if 'language_iso2' in metadata_values else None,
if isinstance(language, tuple): if isinstance(language, tuple):
language = language[0] language = language[0]
node = Node( try:
user_id = user_id, node = Node(
type_id = type_id, user_id = user_id,
name = name, type_id = type_id,
parent = self, name = name,
language_id = language.id if language else None, parent = self,
metadata = metadata_values language_id = language.id if language else None,
) metadata = metadata_values
node.save() )
node.save()
except Exception as e:
print("ERR::node.models.writeMetadata__MOV ")
metadata_values["id"] = node.id metadata_values["id"] = node.id
# # make metadata filterable # # make metadata filterable
self.children.all().make_metadata_filterable() self.children.all().make_metadata_filterable()
...@@ -341,10 +344,8 @@ class Node(CTENode): ...@@ -341,10 +344,8 @@ class Node(CTENode):
if ngramsextractorscache is None: if ngramsextractorscache is None:
ngramsextractorscache = NgramsExtractorsCache() ngramsextractorscache = NgramsExtractorsCache()
langages_cache = LanguagesCache() langages_cache = LanguagesCache()
if ngramscaches is None: if ngramscaches is None:
ngramscaches = NgramsCaches() ngramscaches = NgramsCaches()
results = [] results = []
i = 0 i = 0
for metadata in array: for metadata in array:
...@@ -352,11 +353,9 @@ class Node(CTENode): ...@@ -352,11 +353,9 @@ class Node(CTENode):
language = langages_cache[metadata['language_iso2']] if 'language_iso2' in metadata else None, language = langages_cache[metadata['language_iso2']] if 'language_iso2' in metadata else None,
if isinstance(language, tuple): if isinstance(language, tuple):
language = language[0] language = language[0]
extractor = ngramsextractorscache[language] extractor = ngramsextractorscache[language]
ngrams = ngramscaches[language] ngrams = ngramscaches[language]
# theText = [] # theText = []
if isinstance(keys, dict): if isinstance(keys, dict):
for key, weight in keys.items(): for key, weight in keys.items():
if key in metadata: if key in metadata:
...@@ -373,10 +372,8 @@ class Node(CTENode): ...@@ -373,10 +372,8 @@ class Node(CTENode):
for ngram in extractor.extract_ngrams(text2process): for ngram in extractor.extract_ngrams(text2process):
terms = ' '.join([token for token, tag in ngram]).strip().lower() terms = ' '.join([token for token, tag in ngram]).strip().lower()
associations[terms] += 1 associations[terms] += 1
if(len(associations)>0): if(len(associations)>0):
results.append( [metadata["id"] , associations] ) results.append( [metadata["id"] , associations] )
i+=1 i+=1
return results return results
......
...@@ -128,12 +128,12 @@ def doTheQuery(request , project_id): ...@@ -128,12 +128,12 @@ def doTheQuery(request , project_id):
# do the WorkFlow # do the WorkFlow
try: try:
if DEBUG is True: if DEBUG is True:
corpus.workflow() # old times... # corpus.workflow() # old times...
# corpus.workflow__MOV() corpus.workflow__MOV()
# corpus.write_everything_to_DB() # corpus.write_everything_to_DB()
else: else:
corpus.workflow.apply_async((), countdown=3) # corpus.workflow.apply_async((), countdown=3)
# corpus.workflow__MOV() # synchronous! because is faaast corpus.workflow__MOV().apply_async((), countdown=3) # synchronous! because is faaast
# corpus.write_everything_to_DB.apply_async((), countdown=3) # asynchronous # corpus.write_everything_to_DB.apply_async((), countdown=3) # asynchronous
......
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