From 5a8c32f5d74e4fd288e1d5ec81d9decf28a9ea09 Mon Sep 17 00:00:00 2001
From: Mathieu Loiseau <mathieu.loiseau@liris.cnrs.fr>
Date: Wed, 21 Jun 2023 16:54:32 +0200
Subject: [PATCH] Sense.serialize to keep subsenses
---
wikstraktor.py | 6 +++++-
wikstraktor.sqlite | Bin 45056 -> 49152 bytes
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/wikstraktor.py b/wikstraktor.py
index 74e79ae..639ecd8 100755
--- a/wikstraktor.py
+++ b/wikstraktor.py
@@ -207,7 +207,8 @@ class Sense(SubInfo):
super().__init__(prefix)
self.lang = lang
#On réinitialise les identifiants des sous-éléments
- Sense.reset_sub_counters()
+ if not isinstance(self, SubSense):
+ Sense.reset_sub_counters()
self.definitions = [] #liste des définitions (elles auront une langue et un texte)
self.subsenses = [] #liste des sous-définitions (récursif…)
@@ -339,6 +340,7 @@ class Sense(SubInfo):
res["Translations"].append(t.serializable(prefix))
if len(self.subsenses) > 0:
res["Subsenses"] = {}
+ print("subsenses", self.label, len(self.subsenses))##
for t in self.subsenses:
res["Subsenses"][t.set_id(self.label)]= t.serializable(prefix)
return res
@@ -447,6 +449,7 @@ class Entry:
src = s.get_src_from_id()
if src != None and src_map[src] != src:
s.replace_src_in_id(src, src_map[src])
+ print(s.label, len(s.subsenses))##
for ss in s.subsenses:
ss.replace_src_in_id(src, src_map[src])
for d in ss.definitions:
@@ -455,6 +458,7 @@ class Entry:
e.replace_src_in_id(src, src_map[src])
for t in ss.translations:
t.replace_src_in_id(src, src_map[src])
+ print(s.label, len(s.subsenses))##
for d in s.definitions:
d.replace_src_in_id(src, src_map[src])
for e in s.examples:
diff --git a/wikstraktor.sqlite b/wikstraktor.sqlite
index 8380bbc1054475933b14226aec1304ef78d6f08b..c35b2bb7c4efb8fb7db535875b7336a3d712ec59 100644
GIT binary patch
delta 708
zcmZp8z|_#dJVBauBLf2i&qM`##*G^jmhek)@?QW7F!1pI=Kse3k^c?<bN)yCclfXI
zU)ZcDu$7;gyHR=bHF>=TW<iFlli3$2F<zZmxLUC>u~C`JI95<loF%j|*~q}iSl7Tz
z*T_)8(8S8bz{<pMa^O;($?S_vCaW$^-Mo9DE8ipo7CBxP8wP$cK0{u2o+R!HuF0G$
zIgYU3V*AR*&8o&?v$0T$MX@oh(Ex66E~>$%##ScAP=go9>BE(w*^jIYY`;QUqaIu_
zx|s%6rZC4Ykkf@LLpKvi8Q4tuv_>7cVl*>NEUXMC2Q1YE`hS6}He3~&kw~gwCThXe
zqMK-nWTGZq6}pKCRWN^Rz}2FgXkuk-2@gwkxH5Djk(9yARD&x<H`B<<0AZ#oTp7BV
SNXlSls=yVan~9W|<^ljiue`ee
delta 87
zcmV-d0I2_ffCGTw0+1U8qW}N^3y~l{0i&^Cqz@Pf57qzx000XQ`w#XH@ek||=MUl!
t+z-~XArP_;kx&b>*&i!_0}uhalLw$8v2u|C1c7FOB9lP06|>W!Ee_)j9zOs8
--
GitLab