table acte : add field numb_acte + replace numb_acte by filename

main
jgenero 3 years ago
parent 7932052f60
commit a1174e6409

@ -99,7 +99,9 @@ def _create_doc(xml_file: str, folder: str)-> None:
def _create_acte(xml_file: str, folder: str)-> None: def _create_acte(xml_file: str, folder: str)-> None:
actes = [] actes = []
counter = 0
for acte in sorted(os.listdir(folder)): for acte in sorted(os.listdir(folder)):
counter += 1
soup = make_soup(os.path.join(folder, acte)) soup = make_soup(os.path.join(folder, acte))
numb = soup.TEI["xml:id"] numb = soup.TEI["xml:id"]
date_time = soup.msItem.docDate["when"] 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_query = [t.id_state for t in State.select().where(
State.state_label == diplo_state)] State.state_label == diplo_state)]
actes.append({ actes.append({
"numb_acte": numb, "num_acte": counter,
"filename": numb,
"date_time": date_time, "date_time": date_time,
"date": date, "date": date,
"prod_place_acte": place_query[0], "prod_place_acte": place_query[0],
@ -188,7 +191,7 @@ def _create_involved_in(xml_file: str, folder: str):
princes_actes = [] princes_actes = []
for acte in os.listdir(folder): for acte in os.listdir(folder):
acte_q = [t.id_acte for t in Acte.select().where( 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]) # print(acte, "==", acte_q[0])
soup = make_soup(os.path.join(folder, acte)) soup = make_soup(os.path.join(folder, acte))
for persons in soup.sourceDesc.find_all("listPerson", {"type": "prince"}): for persons in soup.sourceDesc.find_all("listPerson", {"type": "prince"}):

@ -92,7 +92,8 @@ class Document(BaseModel):
class Acte(BaseModel): class Acte(BaseModel):
id_acte = peewee.AutoField() id_acte = peewee.AutoField()
numb_acte = peewee.TextField() num_acte = peewee.IntegerField()
filename = peewee.TextField()
date_time = peewee.TextField() # YYYY-MM-DD date_time = peewee.TextField() # YYYY-MM-DD
date = peewee.TextField() # verbose date = peewee.TextField() # verbose
prod_place_acte = peewee.ForeignKeyField(Production_place, backref='actes') prod_place_acte = peewee.ForeignKeyField(Production_place, backref='actes')

@ -2,7 +2,7 @@
{% block corps %} {% block corps %}
<div class="container marketing" style="margin-top: 50px;"> <div class="container marketing" style="margin-top: 50px;">
{% for item in infos %} {% for item in infos %}
<h1>{{item.numb_acte}}</h1> <h1>{{item.filename}}</h1>
<h2>{{item.date}}. — {{item.prod_place_acte}}</h2> <h2>{{item.date}}. — {{item.prod_place_acte}}</h2>
<p>{{item.analysis}}</p> <p>{{item.analysis}}</p>
<p>{{item.diplo_type_acte}}, {{item.state_doc}}. {{item.doc_acte}}, {{item.ref_acte}}</p> <p>{{item.diplo_type_acte}}, {{item.state_doc}}. {{item.doc_acte}}, {{item.ref_acte}}</p>

Loading…
Cancel
Save