fix: some fixes

Threads number moved to class constant. Now defines "sc_definition" before "nrel_main_idtf".
pavellos21 · Jul 16, 2020 · 5cbf8d9 · 5cbf8d9
1 parent 3a96ec7
commit 5cbf8d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/loaders/WikiDataWithContextLoader.py b/src/loaders/WikiDataWithContextLoader.py
@@ -9,6 +9,7 @@ class WikiDataWithContextLoader(WikiDataLoader):
     def __init__(self):
         super().__init__()
         self._lock = threading.Lock()
+        self._THREADS_NUM = 16
 
     def load_object(self, obj, obj_type):
         page = wptools.page(wikibase=obj, skip=['labels'], silent=True)
@@ -67,7 +68,7 @@ def getEntity(self, entity, lang='en'):
                             re.sub(r"'s?|\(|\)|,", '', self._page.data['title']))
         loading_queue = Queue()
 
-        for _ in range(16):
+        for _ in range(self._THREADS_NUM):
             threading.Thread(target=self.thread_fun, args=[
                              loading_queue, ], daemon=True).start()
 

diff --git a/src/templates/entity.scs b/src/templates/entity.scs
@@ -3,9 +3,9 @@
 	[{{label}}] (* <- lang_{{lang}};; *);{% endfor %}
 <- rrel_key_sc_element: ...
     (*
+		<- sc_definition;;
 		=> nrel_main_idtf:{% for lang, label in labels %}
 			{% if lang == 'ru' %}[Опр.({{label}})]{% else %}[Def.({{label}})]{% endif %} (* <-lang_{{lang}};; *);{% endfor %};
-	    <- sc_definition;;
 	    <= nrel_sc_text_translation:{% for lang, description in descriptions %}
 		    ... (* -> rrel_example: [{{description}}] (* <-lang_{{lang}};; *);; *);{% endfor %};
     *);

diff --git a/src/templates/relation.scs b/src/templates/relation.scs
@@ -3,9 +3,9 @@
 	[{{label}}] (* <- lang_{{lang}};; *);{% endfor %}
 <- rrel_key_sc_element: ...
     (*
+		<- sc_definition;;
 		=> nrel_main_idtf:{% for lang, label in labels %}
 			{% if lang == 'ru' %}[Опр.({{label}})]{% else %}[Def.({{label}})]{% endif %} (* <-lang_{{lang}};; *);{% endfor %};
-	    <- sc_definition;;
 	    <= nrel_sc_text_translation:{% for lang, description in descriptions %}
 		    ... (* -> rrel_example: [{{description}}] (* <-lang_{{lang}};; *);; *);{% endfor %};
     *);