diff --git a/wikstraktor.py b/wikstraktor.py index 74e79aea39c9bdc47f078019ef18dbf20e9bc133..639ecd82b2c05deb8cda1121a5f6a27673a00762 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 Binary files a/wikstraktor.sqlite and b/wikstraktor.sqlite differ