From a1174e6409acc65b5df7a90e5ad2eee9cb3b8873 Mon Sep 17 00:00:00 2001 From: jgenero Date: Thu, 20 Oct 2022 10:47:07 +0200 Subject: [PATCH] table acte : add field numb_acte + replace numb_acte by filename --- app/cmd/db.py | 7 +++++-- app/modeles/data.py | 3 ++- app/templates/acte.html | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/cmd/db.py b/app/cmd/db.py index 3e7d5cc..98684e9 100644 --- a/app/cmd/db.py +++ b/app/cmd/db.py @@ -99,7 +99,9 @@ def _create_doc(xml_file: str, folder: str)-> None: def _create_acte(xml_file: str, folder: str)-> None: actes = [] + counter = 0 for acte in sorted(os.listdir(folder)): + counter += 1 soup = make_soup(os.path.join(folder, acte)) numb = soup.TEI["xml:id"] date_time = soup.msItem.docDate["when"] @@ -123,7 +125,8 @@ def _create_acte(xml_file: str, folder: str)-> None: state_query = [t.id_state for t in State.select().where( State.state_label == diplo_state)] actes.append({ - "numb_acte": numb, + "num_acte": counter, + "filename": numb, "date_time": date_time, "date": date, "prod_place_acte": place_query[0], @@ -188,7 +191,7 @@ def _create_involved_in(xml_file: str, folder: str): princes_actes = [] for acte in os.listdir(folder): acte_q = [t.id_acte for t in Acte.select().where( - Acte.numb_acte == acte.replace(".xml", ""))] + Acte.filename == acte.replace(".xml", ""))] # print(acte, "==", acte_q[0]) soup = make_soup(os.path.join(folder, acte)) for persons in soup.sourceDesc.find_all("listPerson", {"type": "prince"}): diff --git a/app/modeles/data.py b/app/modeles/data.py index cb4ede3..f3132cd 100644 --- a/app/modeles/data.py +++ b/app/modeles/data.py @@ -92,7 +92,8 @@ class Document(BaseModel): class Acte(BaseModel): id_acte = peewee.AutoField() - numb_acte = peewee.TextField() + num_acte = peewee.IntegerField() + filename = peewee.TextField() date_time = peewee.TextField() # YYYY-MM-DD date = peewee.TextField() # verbose prod_place_acte = peewee.ForeignKeyField(Production_place, backref='actes') diff --git a/app/templates/acte.html b/app/templates/acte.html index 72c0773..f87c468 100644 --- a/app/templates/acte.html +++ b/app/templates/acte.html @@ -2,7 +2,7 @@ {% block corps %}
{% for item in infos %} -

{{item.numb_acte}}

+

{{item.filename}}

{{item.date}}. — {{item.prod_place_acte}}

{{item.analysis}}

{{item.diplo_type_acte}}, {{item.state_doc}}. {{item.doc_acte}}, {{item.ref_acte}}