diff --git a/schema_dataklasser.py b/generators/schema_dataklasser.py similarity index 100% rename from schema_dataklasser.py rename to generators/schema_dataklasser.py diff --git a/yaml_generator.py b/generators/yaml_generator.py similarity index 99% rename from yaml_generator.py rename to generators/yaml_generator.py index d8462e6..ed53da6 100644 --- a/yaml_generator.py +++ b/generators/yaml_generator.py @@ -7,7 +7,7 @@ Importeres af xsd_til_yaml.py, jsonschema_til_yaml.py og elastic_til_yaml.py. from __future__ import annotations import os -from schema_dataklasser import XsdFelt, XsdSkabelonRef, XsdKompleksType, XsdListeElement +from generators.schema_dataklasser import XsdFelt, XsdSkabelonRef, XsdKompleksType, XsdListeElement # ============================================================ @@ -278,7 +278,7 @@ def generer_choice_udtræk_yaml( output_type: str = "begge", historik: str = "t2" ) -> None: - from schema_dataklasser import XsdChoiceElement, XsdSkabelonRef, XsdFelt + from generators.schema_dataklasser import XsdChoiceElement, XsdSkabelonRef, XsdFelt liste_navne = {el.element_navn for el in liste_elementer} fælles_prefix_længde = _find_fælles_prefix(liste_elementer) diff --git a/xsd_til_yaml.py b/xsd_til_yaml.py index de79656..2566e1d 100644 --- a/xsd_til_yaml.py +++ b/xsd_til_yaml.py @@ -19,7 +19,7 @@ import os import argparse from xml.etree import ElementTree as ET -from schema_dataklasser import XsdFelt, XsdSkabelonRef, XsdKompleksType, XsdListeElement +from generators.schema_dataklasser import XsdFelt, XsdSkabelonRef, XsdKompleksType, XsdListeElement XS_NS = "http://www.w3.org/2001/XMLSchema" @@ -473,7 +473,7 @@ class XsdParser: def _registrer_choice_elementer(self) -> None: """Finder alle choice-elementer i liste-elementerne.""" - from schema_dataklasser import XsdChoiceElement + from generators.schema_dataklasser import XsdChoiceElement for liste_el in self.liste_elementer: type_navn_rent = _strip_prefix(liste_el.type_navn) if liste_el.type_navn else "" @@ -587,7 +587,7 @@ def main(): print(f"\nGenererer YAML-filer i: {output}") - from yaml_generator import ( + from generators.yaml_generator import ( generer_skabeloner_yaml, generer_nøgler_yaml, generer_udtræk_yaml, diff --git a/xsd_til_yaml_config.yaml b/xsd_til_yaml_config.yaml deleted file mode 100644 index 1c9af15..0000000 --- a/xsd_til_yaml_config.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# xsd_til_yaml_config.yaml -# Konfiguration til xsd_til_yaml.py for CARF DAC8 - -xsd: /home/carsten/Hentet/xml-schema-carf/CARFXML_v1.4.xsd -output: /home/carsten/Dokumenter/GitClone/udpak_semistruktur/tests/bank_test/output/DAC8/ -prefix: udtræk -min_felter: 2 - -# Database schema – bruges til tabel-navne -db_schema: dbo - -# Tabel-navn prefix – fx 'DAC8_' giver 'dbo.DAC8_CARFBody_tmp' -tabel_prefix: DAC8_ - -# Output-type: fil, tabel, eller begge -output_type: fil # fil | tabel | begge - -# Historik-type for tabel-output -historik: t2 # t1 | t2 - - -forkortelser: - CryptoToCryptoIn: CTI - CryptoToCryptoOut: CTO - CryptoFiatIn: CFI - CryptoFiatOut: CFO - CryptoTransferIn: CTRI - CryptoTransferOut: CTRO - TransferWallet: TW - RelevantTransactions: RT - ControllingPerson: CP - NumberofTransactions: NoTrans - NumberofUnits: NumUnits - ExchangeType: ExchType - AltValuation: AltVal - Organisation: Org - Individual: Ind - ResCountryCode: ResCC - CryptoAsset: CAs diff --git a/xsd_til_yaml_config_bank.yaml b/xsd_til_yaml_config_bank.yaml deleted file mode 100644 index 57fd829..0000000 --- a/xsd_til_yaml_config_bank.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# xsd_til_yaml_config.yaml -# Konfiguration til xsd_til_yaml.py for CARF DAC8 - -xsd: /home/carsten/Dokumenter/GitClone/udpak_semistruktur/tests/bank_test/data/bankdata.xsd -output: /home/carsten/Dokumenter/GitClone/udpak_semistruktur/tests/bank_test/output/DAC8/ -prefix: udtræk -min_felter: 2 - -# Database schema – bruges til tabel-navne -db_schema: dbo - -# Tabel-navn prefix – fx 'DAC8_' giver 'dbo.DAC8_CARFBody_tmp' -tabel_prefix: bank_ - -# Output-type: fil, tabel, eller begge -output_type: fil # fil | tabel | begge - -# Historik-type for tabel-output -historik: t2 # t1 | t2 - - -#forkortelser: -# CryptoToCryptoIn: CTI -# CryptoToCryptoOut: CTO -# CryptoFiatIn: CFI -# CryptoFiatOut: CFO -# CryptoTransferIn: CTRI -# CryptoTransferOut: CTRO -# TransferWallet: TW -# RelevantTransactions: RT -# ControllingPerson: CP -# NumberofTransactions: NoTrans -# NumberofUnits: NumUnits -# ExchangeType: ExchType -# AltValuation: AltVal -# Organisation: Org -# Individual: Ind -# ResCountryCode: ResCC