1603_1.py (#33): class DictionariaNotitiae now have more parameters

EticaAI · Apr 21, 2022 · 0757be4 · 0757be4
1 parent 9f6ae55
commit 0757be4
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/officinam/999999999/0/1603_1.py b/officinam/999999999/0/1603_1.py
@@ -726,8 +726,11 @@ def __init__(
         self.m1603_1_1__de_codex = None
         self.m1603_1_1 = None
         self._init_1603_1_1()
-        self.notitiae = DictionariaNotitiae()
         self.dictionaria_linguarum = DictionariaLinguarum()
+        self.notitiae = DictionariaNotitiae(
+            auxilium_linguam=auxilium_linguam,
+            dictionaria_linguarum=self.dictionaria_linguarum
+        )
         self.dictionaria_interlinguarum = DictionariaInterlinguarum()
         self.codex = self._init_codex()
         self.n1603ia = self._init_ix_n1603ia()
@@ -3268,11 +3271,11 @@ def imprimere_in_markdown_tabula_contentorum(self, items_sorted):
             paginae.append(
                 '- <a href="#{0}">{0}</a> '
                 '<sup>C.{1}</sup> <sub>r.I.{2}</sub>  <sub>r.L.{3}</sub>'.format(
-                codex,
-                item['status_quo']['summa']['concepta'],
-                item['status_quo']['summa']['res_interlingualibus'],
-                item['status_quo']['summa']['res_lingualibus'],
-            ))
+                    codex,
+                    item['status_quo']['summa']['concepta'],
+                    item['status_quo']['summa']['res_interlingualibus'],
+                    item['status_quo']['summa']['res_lingualibus'],
+                ))
 
         paginae.append('')
         paginae.append('----')
@@ -4198,10 +4201,24 @@ class DictionariaNotitiae:
 
     """
 
-    def __init__(self):
+    auxilium_linguam = ['lat-Latn']
+
+    def __init__(
+        self,
+        auxilium_linguam: list = None,
+        dictionaria_linguarum: Type['DictionariaLinguarum'] = None
+    ):
 
         self.fontem = NUMERORDINATIO_BASIM + \
             "/1603/1/99/1603_1_99.no1.tm.hxl.csv"
+
+        if auxilium_linguam:
+            self.auxilium_linguam = auxilium_linguam
+        if dictionaria_linguarum:
+            self.dictionaria_linguarum = dictionaria_linguarum
+        else:
+            self.dictionaria_linguarum = DictionariaLinguarum()
+
         self.dictionaria = self._init_dictionaria()
 
     def _init_dictionaria(self):

diff --git a/officinam/999999999/999999999.lib.sh b/officinam/999999999/999999999.lib.sh
@@ -677,11 +677,13 @@ neo_codex_de_numerordinatio() {
 
   echo "${FUNCNAME[0]} [$objectivum_archivum]"
 
+  set -x
   "${ROOTDIR}/999999999/0/1603_1.py" \
     --objectivum-linguam="$est_objectivum_linguam" \
     --auxilium-linguam="$est_auxilium_linguam" \
     --codex-de "$_nomen" \
     >"$objectivum_archivum"
+  set +x
 }
 
 #######################################
@@ -917,11 +919,13 @@ neo_codex_de_numerordinatio_pdf() {
     bundle exec asciidoctor-pdf \
       "$fontem_archivum" --out-file "$objectivum_archivum_temporarium"
   else
+    # set +x
     bundle exec asciidoctor-pdf \
       --attribute pdf-theme="$ascidoctor_theme" \
       --attribute pdf-fontsdir="$ascidoctor_font_dir_neo,$ascidoctor_font_dir_original,$ascidoctor_font_dir_repo" \
       --require "$ascidoctor_custom_library" \
       "$fontem_archivum" --out-file "$objectivum_archivum_temporarium"
+    # set -x
   fi
 
   if [ -f "$objectivum_archivum" ]; then

diff --git a/officinam/999999999/999999_17.sh b/officinam/999999999/999999_17.sh
@@ -64,8 +64,9 @@ ROOTDIR="$(pwd)"
 #### Manual action, TEST locally, one per time, START --------------------------
 # Download entire XLSX to local temp
 file_download_1603_xlsx "1"
-actiones_completis_locali "1603_1_1"
+# actiones_completis_locali "1603_1_1"
 # actiones_completis_locali "1603_1_51"
+actiones_completis_locali "1603_1_99"
 actiones_completis_locali "1603_1_2020"
 # actiones_completis_locali "1603_99_876"