From 4581f34dd9980adfb0462126a5d968ccd8b0bb1e Mon Sep 17 00:00:00 2001 From: Simon Martens Date: Fri, 28 Feb 2025 16:54:49 +0100 Subject: [PATCH] Abschluss Personen & Startseite. Viele BUGFIXes --- .air.toml | 1 + .gitignore | 3 +- dbmodels/agents.go | 1 + .../Static-Bilder}/1-vorschau.jpg | Bin {Static-Bilder => import/Static-Bilder}/1.jpg | Bin .../1770ff_freigestellt_JB-vorschau.png | Bin .../Static-Bilder}/1770ff_freigestellt_JB.png | Bin .../Static-Bilder}/2-vorschau.jpg | Bin {Static-Bilder => import/Static-Bilder}/2.jpg | Bin .../Static-Bilder}/3-vorschau.jpg | Bin {Static-Bilder => import/Static-Bilder}/3.jpg | Bin .../Alm_des_Muses_frgst_JB-hintergrund.png | Bin .../Alm_des_Muses_frgst_JB-vorschau.png | Bin .../Static-Bilder}/Alm_des_Muses_frgst_JB.png | Bin .../Alm_des_Pros_frgst_JB-hintergrund.png | Bin .../Alm_des_Pros_frgst_JB-vorschau.png | Bin .../Static-Bilder}/Alm_des_Pros_frgst_JB.png | Bin .../Apo_und_Schk_frgst_JB-hintergrund.png | Bin .../Apo_und_Schk_frgst_JB-vorschau.png | Bin .../Static-Bilder}/Apo_und_Schk_frgst_JB.png | Bin ...st-, Jagd-, Garten- TBs MS-hintergrund.png | Bin ...Forst-, Jagd-, Garten- TBs MS-vorschau.png | Bin .../Forst-, Jagd-, Garten- TBs MS.png | Bin ...ött. MA, Alm d d M 1770 MS-hintergrund.png | Bin .../Gött. MA, Alm d d M 1770 MS-vorschau.png | Bin .../Gött. MA, Alm d d M 1770 MS.png | Bin .../Kotzebue_Thea_frgst_JB-hintergrund.png | Bin .../Kotzebue_Thea_frgst_JB-vorschau.png | Bin .../Static-Bilder}/Kotzebue_Thea_frgst_JB.png | Bin .../Miniaturformat1-vorschau.png | Bin .../Static-Bilder}/Miniaturformat1.png | Bin .../TB z ges. Vergn-hintergrund.png | Bin .../TB z ges. Vergn-vorschau.png | Bin .../Static-Bilder}/TB z ges. Vergn.png | Bin .../Wiener Almanache-hintergrund.png | Bin .../Wiener Almanache-vorschau.png | Bin .../Static-Bilder}/Wiener Almanache.png | Bin .../Static-Bilder}/beschreibungen.txt | 0 .../Static-Bilder}/musen.png | Bin .../urania-freigestellt-vorschau.png | Bin .../Static-Bilder}/urania-freigestellt.png | Bin .../Static-Bilder}/urania-hintergrund.png | Bin {data => import/data}/Akteure.xml | 0 {data => import/data}/Akteure.xsd | 0 {data => import/data}/Baende.xml | 0 {data => import/data}/Baende.xsd | 0 {data => import/data}/GM-BIBLIO.xml | 0 {data => import/data}/GM-BIBLIO.xsd | 0 {data => import/data}/Inhalte.xml | 0 {data => import/data}/Inhalte.xsd | 0 {data => import/data}/Orte.xml | 0 {data => import/data}/Orte.xsd | 0 {data => import/data}/Reihen.xml | 0 {data => import/data}/Reihen.xsd | 0 .../data}/Static-Bilder/1-vorschau.jpg | Bin {data => import/data}/Static-Bilder/1.jpg | Bin .../1770ff_freigestellt_JB-vorschau.png | Bin .../Static-Bilder/1770ff_freigestellt_JB.png | Bin .../data}/Static-Bilder/2-vorschau.jpg | Bin {data => import/data}/Static-Bilder/2.jpg | Bin .../data}/Static-Bilder/3-vorschau.jpg | Bin {data => import/data}/Static-Bilder/3.jpg | Bin .../Alm_des_Muses_frgst_JB-hintergrund.png | Bin .../Alm_des_Muses_frgst_JB-vorschau.png | Bin .../Static-Bilder/Alm_des_Muses_frgst_JB.png | Bin .../Alm_des_Pros_frgst_JB-hintergrund.png | Bin .../Alm_des_Pros_frgst_JB-vorschau.png | Bin .../Static-Bilder/Alm_des_Pros_frgst_JB.png | Bin .../Apo_und_Schk_frgst_JB-hintergrund.png | Bin .../Apo_und_Schk_frgst_JB-vorschau.png | Bin .../Static-Bilder/Apo_und_Schk_frgst_JB.png | Bin ...st-, Jagd-, Garten- TBs MS-hintergrund.png | Bin ...Forst-, Jagd-, Garten- TBs MS-vorschau.png | Bin .../Forst-, Jagd-, Garten- TBs MS.png | Bin ...ött. MA, Alm d d M 1770 MS-hintergrund.png | Bin .../Gött. MA, Alm d d M 1770 MS-vorschau.png | Bin .../Gött. MA, Alm d d M 1770 MS.png | Bin .../Kotzebue_Thea_frgst_JB-hintergrund.png | Bin .../Kotzebue_Thea_frgst_JB-vorschau.png | Bin .../Static-Bilder/Kotzebue_Thea_frgst_JB.png | Bin .../Miniaturformat1-vorschau.png | Bin .../data}/Static-Bilder/Miniaturformat1.png | Bin .../TB z ges. Vergn-hintergrund.png | Bin .../TB z ges. Vergn-vorschau.png | Bin .../data}/Static-Bilder/TB z ges. Vergn.png | Bin .../Wiener Almanache-hintergrund.png | Bin .../Wiener Almanache-vorschau.png | Bin .../data}/Static-Bilder/Wiener Almanache.png | Bin .../data}/Static-Bilder/beschreibungen.txt | 0 {data => import/data}/Static-Bilder/musen.png | Bin .../urania-freigestellt-vorschau.png | Bin .../Static-Bilder/urania-freigestellt.png | Bin .../Static-Bilder/urania-hintergrund.png | Bin .../data}/_RELATION_BaendeAkteure.xml | 0 .../data}/_RELATION_BaendeAkteure.xsd | 0 .../data}/_RELATION_BaendeReihen.xml | 0 .../data}/_RELATION_BaendeReihen.xsd | 0 .../data}/_RELATION_InhalteAkteure.xml | 0 .../data}/_RELATION_InhalteAkteure.xsd | 0 {data => import/data}/_VOKABULAR_Reihe.xml | 0 {data => import/data}/_VOKABULAR_Reihe.xsd | 0 .../data}/_VOKABULAR_WerkeAkteure.xml | 0 .../data}/_VOKABULAR_WerkeAkteure.xsd | 0 {data => import/data}/abkuerzungen.txt | 0 {data => import/data}/claude/Akteure.txt | 0 {data => import/data}/claude/Baende.txt | 0 {data => import/data}/claude/Orte.txt | 0 {data => import/data}/claude/Reihen.txt | 0 .../data}/claude/_RELATION_BaendeAkteure.txt | 0 .../data}/claude/_RELATION_BaendeReihen.txt | 0 .../data}/claude/_VOKABULAR_Reihe.txt | 0 .../data}/claude/_VOKABULAR_WerkeAkteure.txt | 0 {data => import/data}/rtansfer.py | 0 migrations/seed/contents.go | 1 + .../1739446703_insert_data_dokumentation.go | 2 +- .../1739446703_insert_data_reihen.go | 2 +- pages/person.go | 28 +++- pages/reihen.go | 4 + scratchpad.md | 14 +- views/routes/almanach/body.gohtml | 3 +- views/routes/components/_content.gohtml | 23 ++- views/routes/components/_reihe.gohtml | 4 +- .../routes/components/_reiherelations.gohtml | 17 +++ views/routes/person/body.gohtml | 98 +++++++++---- views/routes/personen/body.gohtml | 10 +- views/routes/reihe/body.gohtml | 2 +- views/routes/suche/baende/body.gohtml | 39 ++++++ views/routes/suche/beitraege/body.gohtml | 5 +- .../suche/components/_searchboxsimple.gohtml | 23 --- views/transform/main.js | 131 +++++++++++++++++- views/transform/site.css | 2 +- xmlmodels/xmldata.go | 6 +- 132 files changed, 333 insertions(+), 86 deletions(-) rename {Static-Bilder => import/Static-Bilder}/1-vorschau.jpg (100%) rename {Static-Bilder => import/Static-Bilder}/1.jpg (100%) rename {Static-Bilder => import/Static-Bilder}/1770ff_freigestellt_JB-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/1770ff_freigestellt_JB.png (100%) rename {Static-Bilder => import/Static-Bilder}/2-vorschau.jpg (100%) rename {Static-Bilder => import/Static-Bilder}/2.jpg (100%) rename {Static-Bilder => import/Static-Bilder}/3-vorschau.jpg (100%) rename {Static-Bilder => import/Static-Bilder}/3.jpg (100%) rename {Static-Bilder => import/Static-Bilder}/Alm_des_Muses_frgst_JB-hintergrund.png (100%) rename {Static-Bilder => import/Static-Bilder}/Alm_des_Muses_frgst_JB-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/Alm_des_Muses_frgst_JB.png (100%) rename {Static-Bilder => import/Static-Bilder}/Alm_des_Pros_frgst_JB-hintergrund.png (100%) rename {Static-Bilder => import/Static-Bilder}/Alm_des_Pros_frgst_JB-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/Alm_des_Pros_frgst_JB.png (100%) rename {Static-Bilder => import/Static-Bilder}/Apo_und_Schk_frgst_JB-hintergrund.png (100%) rename {Static-Bilder => import/Static-Bilder}/Apo_und_Schk_frgst_JB-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/Apo_und_Schk_frgst_JB.png (100%) rename {Static-Bilder => import/Static-Bilder}/Forst-, Jagd-, Garten- TBs MS-hintergrund.png (100%) rename {Static-Bilder => import/Static-Bilder}/Forst-, Jagd-, Garten- TBs MS-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/Forst-, Jagd-, Garten- TBs MS.png (100%) rename {Static-Bilder => import/Static-Bilder}/Gött. MA, Alm d d M 1770 MS-hintergrund.png (100%) rename {Static-Bilder => import/Static-Bilder}/Gött. MA, Alm d d M 1770 MS-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/Gött. MA, Alm d d M 1770 MS.png (100%) rename {Static-Bilder => import/Static-Bilder}/Kotzebue_Thea_frgst_JB-hintergrund.png (100%) rename {Static-Bilder => import/Static-Bilder}/Kotzebue_Thea_frgst_JB-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/Kotzebue_Thea_frgst_JB.png (100%) rename {Static-Bilder => import/Static-Bilder}/Miniaturformat1-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/Miniaturformat1.png (100%) rename {Static-Bilder => import/Static-Bilder}/TB z ges. Vergn-hintergrund.png (100%) rename {Static-Bilder => import/Static-Bilder}/TB z ges. Vergn-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/TB z ges. Vergn.png (100%) rename {Static-Bilder => import/Static-Bilder}/Wiener Almanache-hintergrund.png (100%) rename {Static-Bilder => import/Static-Bilder}/Wiener Almanache-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/Wiener Almanache.png (100%) rename {Static-Bilder => import/Static-Bilder}/beschreibungen.txt (100%) rename {Static-Bilder => import/Static-Bilder}/musen.png (100%) rename {Static-Bilder => import/Static-Bilder}/urania-freigestellt-vorschau.png (100%) rename {Static-Bilder => import/Static-Bilder}/urania-freigestellt.png (100%) rename {Static-Bilder => import/Static-Bilder}/urania-hintergrund.png (100%) rename {data => import/data}/Akteure.xml (100%) rename {data => import/data}/Akteure.xsd (100%) rename {data => import/data}/Baende.xml (100%) rename {data => import/data}/Baende.xsd (100%) rename {data => import/data}/GM-BIBLIO.xml (100%) rename {data => import/data}/GM-BIBLIO.xsd (100%) rename {data => import/data}/Inhalte.xml (100%) rename {data => import/data}/Inhalte.xsd (100%) rename {data => import/data}/Orte.xml (100%) rename {data => import/data}/Orte.xsd (100%) rename {data => import/data}/Reihen.xml (100%) rename {data => import/data}/Reihen.xsd (100%) rename {data => import/data}/Static-Bilder/1-vorschau.jpg (100%) rename {data => import/data}/Static-Bilder/1.jpg (100%) rename {data => import/data}/Static-Bilder/1770ff_freigestellt_JB-vorschau.png (100%) rename {data => import/data}/Static-Bilder/1770ff_freigestellt_JB.png (100%) rename {data => import/data}/Static-Bilder/2-vorschau.jpg (100%) rename {data => import/data}/Static-Bilder/2.jpg (100%) rename {data => import/data}/Static-Bilder/3-vorschau.jpg (100%) rename {data => import/data}/Static-Bilder/3.jpg (100%) rename {data => import/data}/Static-Bilder/Alm_des_Muses_frgst_JB-hintergrund.png (100%) rename {data => import/data}/Static-Bilder/Alm_des_Muses_frgst_JB-vorschau.png (100%) rename {data => import/data}/Static-Bilder/Alm_des_Muses_frgst_JB.png (100%) rename {data => import/data}/Static-Bilder/Alm_des_Pros_frgst_JB-hintergrund.png (100%) rename {data => import/data}/Static-Bilder/Alm_des_Pros_frgst_JB-vorschau.png (100%) rename {data => import/data}/Static-Bilder/Alm_des_Pros_frgst_JB.png (100%) rename {data => import/data}/Static-Bilder/Apo_und_Schk_frgst_JB-hintergrund.png (100%) rename {data => import/data}/Static-Bilder/Apo_und_Schk_frgst_JB-vorschau.png (100%) rename {data => import/data}/Static-Bilder/Apo_und_Schk_frgst_JB.png (100%) rename {data => import/data}/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-hintergrund.png (100%) rename {data => import/data}/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-vorschau.png (100%) rename {data => import/data}/Static-Bilder/Forst-, Jagd-, Garten- TBs MS.png (100%) rename {data => import/data}/Static-Bilder/Gött. MA, Alm d d M 1770 MS-hintergrund.png (100%) rename {data => import/data}/Static-Bilder/Gött. MA, Alm d d M 1770 MS-vorschau.png (100%) rename {data => import/data}/Static-Bilder/Gött. MA, Alm d d M 1770 MS.png (100%) rename {data => import/data}/Static-Bilder/Kotzebue_Thea_frgst_JB-hintergrund.png (100%) rename {data => import/data}/Static-Bilder/Kotzebue_Thea_frgst_JB-vorschau.png (100%) rename {data => import/data}/Static-Bilder/Kotzebue_Thea_frgst_JB.png (100%) rename {data => import/data}/Static-Bilder/Miniaturformat1-vorschau.png (100%) rename {data => import/data}/Static-Bilder/Miniaturformat1.png (100%) rename {data => import/data}/Static-Bilder/TB z ges. Vergn-hintergrund.png (100%) rename {data => import/data}/Static-Bilder/TB z ges. Vergn-vorschau.png (100%) rename {data => import/data}/Static-Bilder/TB z ges. Vergn.png (100%) rename {data => import/data}/Static-Bilder/Wiener Almanache-hintergrund.png (100%) rename {data => import/data}/Static-Bilder/Wiener Almanache-vorschau.png (100%) rename {data => import/data}/Static-Bilder/Wiener Almanache.png (100%) rename {data => import/data}/Static-Bilder/beschreibungen.txt (100%) rename {data => import/data}/Static-Bilder/musen.png (100%) rename {data => import/data}/Static-Bilder/urania-freigestellt-vorschau.png (100%) rename {data => import/data}/Static-Bilder/urania-freigestellt.png (100%) rename {data => import/data}/Static-Bilder/urania-hintergrund.png (100%) rename {data => import/data}/_RELATION_BaendeAkteure.xml (100%) rename {data => import/data}/_RELATION_BaendeAkteure.xsd (100%) rename {data => import/data}/_RELATION_BaendeReihen.xml (100%) rename {data => import/data}/_RELATION_BaendeReihen.xsd (100%) rename {data => import/data}/_RELATION_InhalteAkteure.xml (100%) rename {data => import/data}/_RELATION_InhalteAkteure.xsd (100%) rename {data => import/data}/_VOKABULAR_Reihe.xml (100%) rename {data => import/data}/_VOKABULAR_Reihe.xsd (100%) rename {data => import/data}/_VOKABULAR_WerkeAkteure.xml (100%) rename {data => import/data}/_VOKABULAR_WerkeAkteure.xsd (100%) rename {data => import/data}/abkuerzungen.txt (100%) rename {data => import/data}/claude/Akteure.txt (100%) rename {data => import/data}/claude/Baende.txt (100%) rename {data => import/data}/claude/Orte.txt (100%) rename {data => import/data}/claude/Reihen.txt (100%) rename {data => import/data}/claude/_RELATION_BaendeAkteure.txt (100%) rename {data => import/data}/claude/_RELATION_BaendeReihen.txt (100%) rename {data => import/data}/claude/_VOKABULAR_Reihe.txt (100%) rename {data => import/data}/claude/_VOKABULAR_WerkeAkteure.txt (100%) rename {data => import/data}/rtansfer.py (100%) diff --git a/.air.toml b/.air.toml index 824b4f6..cac182b 100644 --- a/.air.toml +++ b/.air.toml @@ -8,6 +8,7 @@ full_bin = "./tmp/musenalm --dir ./pb_data serve" cmd = "go build -tags=dev,fts5,sqlite_icu -o ./tmp/musenalm ." delay = 400 exclude_dir = [ + "import", "views/assets", "views/transform", "views/routes", diff --git a/.gitignore b/.gitignore index ba97ceb..60bd0f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,12 @@ pb_data/ +_tmp/ +import/Almanach-Bilder/ musenalm node_modules tmp/ bin/ cache/ data_bilder/ -Almanach-Bilder/ config.json out.log *.log diff --git a/dbmodels/agents.go b/dbmodels/agents.go index 3dee7b7..6519484 100644 --- a/dbmodels/agents.go +++ b/dbmodels/agents.go @@ -291,6 +291,7 @@ func AgentsForOrg(app core.App, org bool, letter string) ([]*Agent, error) { return agents, nil } +// BUG: thesew functions are terribly inefficient, since they output way too much data type AgentCount struct { Count int `db:"count"` ID string `db:"id"` diff --git a/Static-Bilder/1-vorschau.jpg b/import/Static-Bilder/1-vorschau.jpg similarity index 100% rename from Static-Bilder/1-vorschau.jpg rename to import/Static-Bilder/1-vorschau.jpg diff --git a/Static-Bilder/1.jpg b/import/Static-Bilder/1.jpg similarity index 100% rename from Static-Bilder/1.jpg rename to import/Static-Bilder/1.jpg diff --git a/Static-Bilder/1770ff_freigestellt_JB-vorschau.png b/import/Static-Bilder/1770ff_freigestellt_JB-vorschau.png similarity index 100% rename from Static-Bilder/1770ff_freigestellt_JB-vorschau.png rename to import/Static-Bilder/1770ff_freigestellt_JB-vorschau.png diff --git a/Static-Bilder/1770ff_freigestellt_JB.png b/import/Static-Bilder/1770ff_freigestellt_JB.png similarity index 100% rename from Static-Bilder/1770ff_freigestellt_JB.png rename to import/Static-Bilder/1770ff_freigestellt_JB.png diff --git a/Static-Bilder/2-vorschau.jpg b/import/Static-Bilder/2-vorschau.jpg similarity index 100% rename from Static-Bilder/2-vorschau.jpg rename to import/Static-Bilder/2-vorschau.jpg diff --git a/Static-Bilder/2.jpg b/import/Static-Bilder/2.jpg similarity index 100% rename from Static-Bilder/2.jpg rename to import/Static-Bilder/2.jpg diff --git a/Static-Bilder/3-vorschau.jpg b/import/Static-Bilder/3-vorschau.jpg similarity index 100% rename from Static-Bilder/3-vorschau.jpg rename to import/Static-Bilder/3-vorschau.jpg diff --git a/Static-Bilder/3.jpg b/import/Static-Bilder/3.jpg similarity index 100% rename from Static-Bilder/3.jpg rename to import/Static-Bilder/3.jpg diff --git a/Static-Bilder/Alm_des_Muses_frgst_JB-hintergrund.png b/import/Static-Bilder/Alm_des_Muses_frgst_JB-hintergrund.png similarity index 100% rename from Static-Bilder/Alm_des_Muses_frgst_JB-hintergrund.png rename to import/Static-Bilder/Alm_des_Muses_frgst_JB-hintergrund.png diff --git a/Static-Bilder/Alm_des_Muses_frgst_JB-vorschau.png b/import/Static-Bilder/Alm_des_Muses_frgst_JB-vorschau.png similarity index 100% rename from Static-Bilder/Alm_des_Muses_frgst_JB-vorschau.png rename to import/Static-Bilder/Alm_des_Muses_frgst_JB-vorschau.png diff --git a/Static-Bilder/Alm_des_Muses_frgst_JB.png b/import/Static-Bilder/Alm_des_Muses_frgst_JB.png similarity index 100% rename from Static-Bilder/Alm_des_Muses_frgst_JB.png rename to import/Static-Bilder/Alm_des_Muses_frgst_JB.png diff --git a/Static-Bilder/Alm_des_Pros_frgst_JB-hintergrund.png b/import/Static-Bilder/Alm_des_Pros_frgst_JB-hintergrund.png similarity index 100% rename from Static-Bilder/Alm_des_Pros_frgst_JB-hintergrund.png rename to import/Static-Bilder/Alm_des_Pros_frgst_JB-hintergrund.png diff --git a/Static-Bilder/Alm_des_Pros_frgst_JB-vorschau.png b/import/Static-Bilder/Alm_des_Pros_frgst_JB-vorschau.png similarity index 100% rename from Static-Bilder/Alm_des_Pros_frgst_JB-vorschau.png rename to import/Static-Bilder/Alm_des_Pros_frgst_JB-vorschau.png diff --git a/Static-Bilder/Alm_des_Pros_frgst_JB.png b/import/Static-Bilder/Alm_des_Pros_frgst_JB.png similarity index 100% rename from Static-Bilder/Alm_des_Pros_frgst_JB.png rename to import/Static-Bilder/Alm_des_Pros_frgst_JB.png diff --git a/Static-Bilder/Apo_und_Schk_frgst_JB-hintergrund.png b/import/Static-Bilder/Apo_und_Schk_frgst_JB-hintergrund.png similarity index 100% rename from Static-Bilder/Apo_und_Schk_frgst_JB-hintergrund.png rename to import/Static-Bilder/Apo_und_Schk_frgst_JB-hintergrund.png diff --git a/Static-Bilder/Apo_und_Schk_frgst_JB-vorschau.png b/import/Static-Bilder/Apo_und_Schk_frgst_JB-vorschau.png similarity index 100% rename from Static-Bilder/Apo_und_Schk_frgst_JB-vorschau.png rename to import/Static-Bilder/Apo_und_Schk_frgst_JB-vorschau.png diff --git a/Static-Bilder/Apo_und_Schk_frgst_JB.png b/import/Static-Bilder/Apo_und_Schk_frgst_JB.png similarity index 100% rename from Static-Bilder/Apo_und_Schk_frgst_JB.png rename to import/Static-Bilder/Apo_und_Schk_frgst_JB.png diff --git a/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-hintergrund.png b/import/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-hintergrund.png similarity index 100% rename from Static-Bilder/Forst-, Jagd-, Garten- TBs MS-hintergrund.png rename to import/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-hintergrund.png diff --git a/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-vorschau.png b/import/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-vorschau.png similarity index 100% rename from Static-Bilder/Forst-, Jagd-, Garten- TBs MS-vorschau.png rename to import/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-vorschau.png diff --git a/Static-Bilder/Forst-, Jagd-, Garten- TBs MS.png b/import/Static-Bilder/Forst-, Jagd-, Garten- TBs MS.png similarity index 100% rename from Static-Bilder/Forst-, Jagd-, Garten- TBs MS.png rename to import/Static-Bilder/Forst-, Jagd-, Garten- TBs MS.png diff --git a/Static-Bilder/Gött. MA, Alm d d M 1770 MS-hintergrund.png b/import/Static-Bilder/Gött. MA, Alm d d M 1770 MS-hintergrund.png similarity index 100% rename from Static-Bilder/Gött. MA, Alm d d M 1770 MS-hintergrund.png rename to import/Static-Bilder/Gött. MA, Alm d d M 1770 MS-hintergrund.png diff --git a/Static-Bilder/Gött. MA, Alm d d M 1770 MS-vorschau.png b/import/Static-Bilder/Gött. MA, Alm d d M 1770 MS-vorschau.png similarity index 100% rename from Static-Bilder/Gött. MA, Alm d d M 1770 MS-vorschau.png rename to import/Static-Bilder/Gött. MA, Alm d d M 1770 MS-vorschau.png diff --git a/Static-Bilder/Gött. MA, Alm d d M 1770 MS.png b/import/Static-Bilder/Gött. MA, Alm d d M 1770 MS.png similarity index 100% rename from Static-Bilder/Gött. MA, Alm d d M 1770 MS.png rename to import/Static-Bilder/Gött. MA, Alm d d M 1770 MS.png diff --git a/Static-Bilder/Kotzebue_Thea_frgst_JB-hintergrund.png b/import/Static-Bilder/Kotzebue_Thea_frgst_JB-hintergrund.png similarity index 100% rename from Static-Bilder/Kotzebue_Thea_frgst_JB-hintergrund.png rename to import/Static-Bilder/Kotzebue_Thea_frgst_JB-hintergrund.png diff --git a/Static-Bilder/Kotzebue_Thea_frgst_JB-vorschau.png b/import/Static-Bilder/Kotzebue_Thea_frgst_JB-vorschau.png similarity index 100% rename from Static-Bilder/Kotzebue_Thea_frgst_JB-vorschau.png rename to import/Static-Bilder/Kotzebue_Thea_frgst_JB-vorschau.png diff --git a/Static-Bilder/Kotzebue_Thea_frgst_JB.png b/import/Static-Bilder/Kotzebue_Thea_frgst_JB.png similarity index 100% rename from Static-Bilder/Kotzebue_Thea_frgst_JB.png rename to import/Static-Bilder/Kotzebue_Thea_frgst_JB.png diff --git a/Static-Bilder/Miniaturformat1-vorschau.png b/import/Static-Bilder/Miniaturformat1-vorschau.png similarity index 100% rename from Static-Bilder/Miniaturformat1-vorschau.png rename to import/Static-Bilder/Miniaturformat1-vorschau.png diff --git a/Static-Bilder/Miniaturformat1.png b/import/Static-Bilder/Miniaturformat1.png similarity index 100% rename from Static-Bilder/Miniaturformat1.png rename to import/Static-Bilder/Miniaturformat1.png diff --git a/Static-Bilder/TB z ges. Vergn-hintergrund.png b/import/Static-Bilder/TB z ges. Vergn-hintergrund.png similarity index 100% rename from Static-Bilder/TB z ges. Vergn-hintergrund.png rename to import/Static-Bilder/TB z ges. Vergn-hintergrund.png diff --git a/Static-Bilder/TB z ges. Vergn-vorschau.png b/import/Static-Bilder/TB z ges. Vergn-vorschau.png similarity index 100% rename from Static-Bilder/TB z ges. Vergn-vorschau.png rename to import/Static-Bilder/TB z ges. Vergn-vorschau.png diff --git a/Static-Bilder/TB z ges. Vergn.png b/import/Static-Bilder/TB z ges. Vergn.png similarity index 100% rename from Static-Bilder/TB z ges. Vergn.png rename to import/Static-Bilder/TB z ges. Vergn.png diff --git a/Static-Bilder/Wiener Almanache-hintergrund.png b/import/Static-Bilder/Wiener Almanache-hintergrund.png similarity index 100% rename from Static-Bilder/Wiener Almanache-hintergrund.png rename to import/Static-Bilder/Wiener Almanache-hintergrund.png diff --git a/Static-Bilder/Wiener Almanache-vorschau.png b/import/Static-Bilder/Wiener Almanache-vorschau.png similarity index 100% rename from Static-Bilder/Wiener Almanache-vorschau.png rename to import/Static-Bilder/Wiener Almanache-vorschau.png diff --git a/Static-Bilder/Wiener Almanache.png b/import/Static-Bilder/Wiener Almanache.png similarity index 100% rename from Static-Bilder/Wiener Almanache.png rename to import/Static-Bilder/Wiener Almanache.png diff --git a/Static-Bilder/beschreibungen.txt b/import/Static-Bilder/beschreibungen.txt similarity index 100% rename from Static-Bilder/beschreibungen.txt rename to import/Static-Bilder/beschreibungen.txt diff --git a/Static-Bilder/musen.png b/import/Static-Bilder/musen.png similarity index 100% rename from Static-Bilder/musen.png rename to import/Static-Bilder/musen.png diff --git a/Static-Bilder/urania-freigestellt-vorschau.png b/import/Static-Bilder/urania-freigestellt-vorschau.png similarity index 100% rename from Static-Bilder/urania-freigestellt-vorschau.png rename to import/Static-Bilder/urania-freigestellt-vorschau.png diff --git a/Static-Bilder/urania-freigestellt.png b/import/Static-Bilder/urania-freigestellt.png similarity index 100% rename from Static-Bilder/urania-freigestellt.png rename to import/Static-Bilder/urania-freigestellt.png diff --git a/Static-Bilder/urania-hintergrund.png b/import/Static-Bilder/urania-hintergrund.png similarity index 100% rename from Static-Bilder/urania-hintergrund.png rename to import/Static-Bilder/urania-hintergrund.png diff --git a/data/Akteure.xml b/import/data/Akteure.xml similarity index 100% rename from data/Akteure.xml rename to import/data/Akteure.xml diff --git a/data/Akteure.xsd b/import/data/Akteure.xsd similarity index 100% rename from data/Akteure.xsd rename to import/data/Akteure.xsd diff --git a/data/Baende.xml b/import/data/Baende.xml similarity index 100% rename from data/Baende.xml rename to import/data/Baende.xml diff --git a/data/Baende.xsd b/import/data/Baende.xsd similarity index 100% rename from data/Baende.xsd rename to import/data/Baende.xsd diff --git a/data/GM-BIBLIO.xml b/import/data/GM-BIBLIO.xml similarity index 100% rename from data/GM-BIBLIO.xml rename to import/data/GM-BIBLIO.xml diff --git a/data/GM-BIBLIO.xsd b/import/data/GM-BIBLIO.xsd similarity index 100% rename from data/GM-BIBLIO.xsd rename to import/data/GM-BIBLIO.xsd diff --git a/data/Inhalte.xml b/import/data/Inhalte.xml similarity index 100% rename from data/Inhalte.xml rename to import/data/Inhalte.xml diff --git a/data/Inhalte.xsd b/import/data/Inhalte.xsd similarity index 100% rename from data/Inhalte.xsd rename to import/data/Inhalte.xsd diff --git a/data/Orte.xml b/import/data/Orte.xml similarity index 100% rename from data/Orte.xml rename to import/data/Orte.xml diff --git a/data/Orte.xsd b/import/data/Orte.xsd similarity index 100% rename from data/Orte.xsd rename to import/data/Orte.xsd diff --git a/data/Reihen.xml b/import/data/Reihen.xml similarity index 100% rename from data/Reihen.xml rename to import/data/Reihen.xml diff --git a/data/Reihen.xsd b/import/data/Reihen.xsd similarity index 100% rename from data/Reihen.xsd rename to import/data/Reihen.xsd diff --git a/data/Static-Bilder/1-vorschau.jpg b/import/data/Static-Bilder/1-vorschau.jpg similarity index 100% rename from data/Static-Bilder/1-vorschau.jpg rename to import/data/Static-Bilder/1-vorschau.jpg diff --git a/data/Static-Bilder/1.jpg b/import/data/Static-Bilder/1.jpg similarity index 100% rename from data/Static-Bilder/1.jpg rename to import/data/Static-Bilder/1.jpg diff --git a/data/Static-Bilder/1770ff_freigestellt_JB-vorschau.png b/import/data/Static-Bilder/1770ff_freigestellt_JB-vorschau.png similarity index 100% rename from data/Static-Bilder/1770ff_freigestellt_JB-vorschau.png rename to import/data/Static-Bilder/1770ff_freigestellt_JB-vorschau.png diff --git a/data/Static-Bilder/1770ff_freigestellt_JB.png b/import/data/Static-Bilder/1770ff_freigestellt_JB.png similarity index 100% rename from data/Static-Bilder/1770ff_freigestellt_JB.png rename to import/data/Static-Bilder/1770ff_freigestellt_JB.png diff --git a/data/Static-Bilder/2-vorschau.jpg b/import/data/Static-Bilder/2-vorschau.jpg similarity index 100% rename from data/Static-Bilder/2-vorschau.jpg rename to import/data/Static-Bilder/2-vorschau.jpg diff --git a/data/Static-Bilder/2.jpg b/import/data/Static-Bilder/2.jpg similarity index 100% rename from data/Static-Bilder/2.jpg rename to import/data/Static-Bilder/2.jpg diff --git a/data/Static-Bilder/3-vorschau.jpg b/import/data/Static-Bilder/3-vorschau.jpg similarity index 100% rename from data/Static-Bilder/3-vorschau.jpg rename to import/data/Static-Bilder/3-vorschau.jpg diff --git a/data/Static-Bilder/3.jpg b/import/data/Static-Bilder/3.jpg similarity index 100% rename from data/Static-Bilder/3.jpg rename to import/data/Static-Bilder/3.jpg diff --git a/data/Static-Bilder/Alm_des_Muses_frgst_JB-hintergrund.png b/import/data/Static-Bilder/Alm_des_Muses_frgst_JB-hintergrund.png similarity index 100% rename from data/Static-Bilder/Alm_des_Muses_frgst_JB-hintergrund.png rename to import/data/Static-Bilder/Alm_des_Muses_frgst_JB-hintergrund.png diff --git a/data/Static-Bilder/Alm_des_Muses_frgst_JB-vorschau.png b/import/data/Static-Bilder/Alm_des_Muses_frgst_JB-vorschau.png similarity index 100% rename from data/Static-Bilder/Alm_des_Muses_frgst_JB-vorschau.png rename to import/data/Static-Bilder/Alm_des_Muses_frgst_JB-vorschau.png diff --git a/data/Static-Bilder/Alm_des_Muses_frgst_JB.png b/import/data/Static-Bilder/Alm_des_Muses_frgst_JB.png similarity index 100% rename from data/Static-Bilder/Alm_des_Muses_frgst_JB.png rename to import/data/Static-Bilder/Alm_des_Muses_frgst_JB.png diff --git a/data/Static-Bilder/Alm_des_Pros_frgst_JB-hintergrund.png b/import/data/Static-Bilder/Alm_des_Pros_frgst_JB-hintergrund.png similarity index 100% rename from data/Static-Bilder/Alm_des_Pros_frgst_JB-hintergrund.png rename to import/data/Static-Bilder/Alm_des_Pros_frgst_JB-hintergrund.png diff --git a/data/Static-Bilder/Alm_des_Pros_frgst_JB-vorschau.png b/import/data/Static-Bilder/Alm_des_Pros_frgst_JB-vorschau.png similarity index 100% rename from data/Static-Bilder/Alm_des_Pros_frgst_JB-vorschau.png rename to import/data/Static-Bilder/Alm_des_Pros_frgst_JB-vorschau.png diff --git a/data/Static-Bilder/Alm_des_Pros_frgst_JB.png b/import/data/Static-Bilder/Alm_des_Pros_frgst_JB.png similarity index 100% rename from data/Static-Bilder/Alm_des_Pros_frgst_JB.png rename to import/data/Static-Bilder/Alm_des_Pros_frgst_JB.png diff --git a/data/Static-Bilder/Apo_und_Schk_frgst_JB-hintergrund.png b/import/data/Static-Bilder/Apo_und_Schk_frgst_JB-hintergrund.png similarity index 100% rename from data/Static-Bilder/Apo_und_Schk_frgst_JB-hintergrund.png rename to import/data/Static-Bilder/Apo_und_Schk_frgst_JB-hintergrund.png diff --git a/data/Static-Bilder/Apo_und_Schk_frgst_JB-vorschau.png b/import/data/Static-Bilder/Apo_und_Schk_frgst_JB-vorschau.png similarity index 100% rename from data/Static-Bilder/Apo_und_Schk_frgst_JB-vorschau.png rename to import/data/Static-Bilder/Apo_und_Schk_frgst_JB-vorschau.png diff --git a/data/Static-Bilder/Apo_und_Schk_frgst_JB.png b/import/data/Static-Bilder/Apo_und_Schk_frgst_JB.png similarity index 100% rename from data/Static-Bilder/Apo_und_Schk_frgst_JB.png rename to import/data/Static-Bilder/Apo_und_Schk_frgst_JB.png diff --git a/data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-hintergrund.png b/import/data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-hintergrund.png similarity index 100% rename from data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-hintergrund.png rename to import/data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-hintergrund.png diff --git a/data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-vorschau.png b/import/data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-vorschau.png similarity index 100% rename from data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-vorschau.png rename to import/data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS-vorschau.png diff --git a/data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS.png b/import/data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS.png similarity index 100% rename from data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS.png rename to import/data/Static-Bilder/Forst-, Jagd-, Garten- TBs MS.png diff --git a/data/Static-Bilder/Gött. MA, Alm d d M 1770 MS-hintergrund.png b/import/data/Static-Bilder/Gött. MA, Alm d d M 1770 MS-hintergrund.png similarity index 100% rename from data/Static-Bilder/Gött. MA, Alm d d M 1770 MS-hintergrund.png rename to import/data/Static-Bilder/Gött. MA, Alm d d M 1770 MS-hintergrund.png diff --git a/data/Static-Bilder/Gött. MA, Alm d d M 1770 MS-vorschau.png b/import/data/Static-Bilder/Gött. MA, Alm d d M 1770 MS-vorschau.png similarity index 100% rename from data/Static-Bilder/Gött. MA, Alm d d M 1770 MS-vorschau.png rename to import/data/Static-Bilder/Gött. MA, Alm d d M 1770 MS-vorschau.png diff --git a/data/Static-Bilder/Gött. MA, Alm d d M 1770 MS.png b/import/data/Static-Bilder/Gött. MA, Alm d d M 1770 MS.png similarity index 100% rename from data/Static-Bilder/Gött. MA, Alm d d M 1770 MS.png rename to import/data/Static-Bilder/Gött. MA, Alm d d M 1770 MS.png diff --git a/data/Static-Bilder/Kotzebue_Thea_frgst_JB-hintergrund.png b/import/data/Static-Bilder/Kotzebue_Thea_frgst_JB-hintergrund.png similarity index 100% rename from data/Static-Bilder/Kotzebue_Thea_frgst_JB-hintergrund.png rename to import/data/Static-Bilder/Kotzebue_Thea_frgst_JB-hintergrund.png diff --git a/data/Static-Bilder/Kotzebue_Thea_frgst_JB-vorschau.png b/import/data/Static-Bilder/Kotzebue_Thea_frgst_JB-vorschau.png similarity index 100% rename from data/Static-Bilder/Kotzebue_Thea_frgst_JB-vorschau.png rename to import/data/Static-Bilder/Kotzebue_Thea_frgst_JB-vorschau.png diff --git a/data/Static-Bilder/Kotzebue_Thea_frgst_JB.png b/import/data/Static-Bilder/Kotzebue_Thea_frgst_JB.png similarity index 100% rename from data/Static-Bilder/Kotzebue_Thea_frgst_JB.png rename to import/data/Static-Bilder/Kotzebue_Thea_frgst_JB.png diff --git a/data/Static-Bilder/Miniaturformat1-vorschau.png b/import/data/Static-Bilder/Miniaturformat1-vorschau.png similarity index 100% rename from data/Static-Bilder/Miniaturformat1-vorschau.png rename to import/data/Static-Bilder/Miniaturformat1-vorschau.png diff --git a/data/Static-Bilder/Miniaturformat1.png b/import/data/Static-Bilder/Miniaturformat1.png similarity index 100% rename from data/Static-Bilder/Miniaturformat1.png rename to import/data/Static-Bilder/Miniaturformat1.png diff --git a/data/Static-Bilder/TB z ges. Vergn-hintergrund.png b/import/data/Static-Bilder/TB z ges. Vergn-hintergrund.png similarity index 100% rename from data/Static-Bilder/TB z ges. Vergn-hintergrund.png rename to import/data/Static-Bilder/TB z ges. Vergn-hintergrund.png diff --git a/data/Static-Bilder/TB z ges. Vergn-vorschau.png b/import/data/Static-Bilder/TB z ges. Vergn-vorschau.png similarity index 100% rename from data/Static-Bilder/TB z ges. Vergn-vorschau.png rename to import/data/Static-Bilder/TB z ges. Vergn-vorschau.png diff --git a/data/Static-Bilder/TB z ges. Vergn.png b/import/data/Static-Bilder/TB z ges. Vergn.png similarity index 100% rename from data/Static-Bilder/TB z ges. Vergn.png rename to import/data/Static-Bilder/TB z ges. Vergn.png diff --git a/data/Static-Bilder/Wiener Almanache-hintergrund.png b/import/data/Static-Bilder/Wiener Almanache-hintergrund.png similarity index 100% rename from data/Static-Bilder/Wiener Almanache-hintergrund.png rename to import/data/Static-Bilder/Wiener Almanache-hintergrund.png diff --git a/data/Static-Bilder/Wiener Almanache-vorschau.png b/import/data/Static-Bilder/Wiener Almanache-vorschau.png similarity index 100% rename from data/Static-Bilder/Wiener Almanache-vorschau.png rename to import/data/Static-Bilder/Wiener Almanache-vorschau.png diff --git a/data/Static-Bilder/Wiener Almanache.png b/import/data/Static-Bilder/Wiener Almanache.png similarity index 100% rename from data/Static-Bilder/Wiener Almanache.png rename to import/data/Static-Bilder/Wiener Almanache.png diff --git a/data/Static-Bilder/beschreibungen.txt b/import/data/Static-Bilder/beschreibungen.txt similarity index 100% rename from data/Static-Bilder/beschreibungen.txt rename to import/data/Static-Bilder/beschreibungen.txt diff --git a/data/Static-Bilder/musen.png b/import/data/Static-Bilder/musen.png similarity index 100% rename from data/Static-Bilder/musen.png rename to import/data/Static-Bilder/musen.png diff --git a/data/Static-Bilder/urania-freigestellt-vorschau.png b/import/data/Static-Bilder/urania-freigestellt-vorschau.png similarity index 100% rename from data/Static-Bilder/urania-freigestellt-vorschau.png rename to import/data/Static-Bilder/urania-freigestellt-vorschau.png diff --git a/data/Static-Bilder/urania-freigestellt.png b/import/data/Static-Bilder/urania-freigestellt.png similarity index 100% rename from data/Static-Bilder/urania-freigestellt.png rename to import/data/Static-Bilder/urania-freigestellt.png diff --git a/data/Static-Bilder/urania-hintergrund.png b/import/data/Static-Bilder/urania-hintergrund.png similarity index 100% rename from data/Static-Bilder/urania-hintergrund.png rename to import/data/Static-Bilder/urania-hintergrund.png diff --git a/data/_RELATION_BaendeAkteure.xml b/import/data/_RELATION_BaendeAkteure.xml similarity index 100% rename from data/_RELATION_BaendeAkteure.xml rename to import/data/_RELATION_BaendeAkteure.xml diff --git a/data/_RELATION_BaendeAkteure.xsd b/import/data/_RELATION_BaendeAkteure.xsd similarity index 100% rename from data/_RELATION_BaendeAkteure.xsd rename to import/data/_RELATION_BaendeAkteure.xsd diff --git a/data/_RELATION_BaendeReihen.xml b/import/data/_RELATION_BaendeReihen.xml similarity index 100% rename from data/_RELATION_BaendeReihen.xml rename to import/data/_RELATION_BaendeReihen.xml diff --git a/data/_RELATION_BaendeReihen.xsd b/import/data/_RELATION_BaendeReihen.xsd similarity index 100% rename from data/_RELATION_BaendeReihen.xsd rename to import/data/_RELATION_BaendeReihen.xsd diff --git a/data/_RELATION_InhalteAkteure.xml b/import/data/_RELATION_InhalteAkteure.xml similarity index 100% rename from data/_RELATION_InhalteAkteure.xml rename to import/data/_RELATION_InhalteAkteure.xml diff --git a/data/_RELATION_InhalteAkteure.xsd b/import/data/_RELATION_InhalteAkteure.xsd similarity index 100% rename from data/_RELATION_InhalteAkteure.xsd rename to import/data/_RELATION_InhalteAkteure.xsd diff --git a/data/_VOKABULAR_Reihe.xml b/import/data/_VOKABULAR_Reihe.xml similarity index 100% rename from data/_VOKABULAR_Reihe.xml rename to import/data/_VOKABULAR_Reihe.xml diff --git a/data/_VOKABULAR_Reihe.xsd b/import/data/_VOKABULAR_Reihe.xsd similarity index 100% rename from data/_VOKABULAR_Reihe.xsd rename to import/data/_VOKABULAR_Reihe.xsd diff --git a/data/_VOKABULAR_WerkeAkteure.xml b/import/data/_VOKABULAR_WerkeAkteure.xml similarity index 100% rename from data/_VOKABULAR_WerkeAkteure.xml rename to import/data/_VOKABULAR_WerkeAkteure.xml diff --git a/data/_VOKABULAR_WerkeAkteure.xsd b/import/data/_VOKABULAR_WerkeAkteure.xsd similarity index 100% rename from data/_VOKABULAR_WerkeAkteure.xsd rename to import/data/_VOKABULAR_WerkeAkteure.xsd diff --git a/data/abkuerzungen.txt b/import/data/abkuerzungen.txt similarity index 100% rename from data/abkuerzungen.txt rename to import/data/abkuerzungen.txt diff --git a/data/claude/Akteure.txt b/import/data/claude/Akteure.txt similarity index 100% rename from data/claude/Akteure.txt rename to import/data/claude/Akteure.txt diff --git a/data/claude/Baende.txt b/import/data/claude/Baende.txt similarity index 100% rename from data/claude/Baende.txt rename to import/data/claude/Baende.txt diff --git a/data/claude/Orte.txt b/import/data/claude/Orte.txt similarity index 100% rename from data/claude/Orte.txt rename to import/data/claude/Orte.txt diff --git a/data/claude/Reihen.txt b/import/data/claude/Reihen.txt similarity index 100% rename from data/claude/Reihen.txt rename to import/data/claude/Reihen.txt diff --git a/data/claude/_RELATION_BaendeAkteure.txt b/import/data/claude/_RELATION_BaendeAkteure.txt similarity index 100% rename from data/claude/_RELATION_BaendeAkteure.txt rename to import/data/claude/_RELATION_BaendeAkteure.txt diff --git a/data/claude/_RELATION_BaendeReihen.txt b/import/data/claude/_RELATION_BaendeReihen.txt similarity index 100% rename from data/claude/_RELATION_BaendeReihen.txt rename to import/data/claude/_RELATION_BaendeReihen.txt diff --git a/data/claude/_VOKABULAR_Reihe.txt b/import/data/claude/_VOKABULAR_Reihe.txt similarity index 100% rename from data/claude/_VOKABULAR_Reihe.txt rename to import/data/claude/_VOKABULAR_Reihe.txt diff --git a/data/claude/_VOKABULAR_WerkeAkteure.txt b/import/data/claude/_VOKABULAR_WerkeAkteure.txt similarity index 100% rename from data/claude/_VOKABULAR_WerkeAkteure.txt rename to import/data/claude/_VOKABULAR_WerkeAkteure.txt diff --git a/data/rtansfer.py b/import/data/rtansfer.py similarity index 100% rename from data/rtansfer.py rename to import/data/rtansfer.py diff --git a/migrations/seed/contents.go b/migrations/seed/contents.go index f2f3411..bc1733e 100644 --- a/migrations/seed/contents.go +++ b/migrations/seed/contents.go @@ -44,6 +44,7 @@ func RecordsFromInhalte( record.SetExtent(NormalizeString(inhalt.Seite)) record.SetTitleStmt(NormalizeString(inhalt.Titelangabe)) record.SetIncipitStmt(NormalizeString(inhalt.Incipit)) + record.SetYear(band.Year()) counting, ok := dbmodels.MUSENALM_PAGINATION_VALUES[inhalt.Paginierung] if ok { diff --git a/pages/migrations_dokumentation/1739446703_insert_data_dokumentation.go b/pages/migrations_dokumentation/1739446703_insert_data_dokumentation.go index 23e24ce..b1db898 100644 --- a/pages/migrations_dokumentation/1739446703_insert_data_dokumentation.go +++ b/pages/migrations_dokumentation/1739446703_insert_data_dokumentation.go @@ -480,7 +480,7 @@ const START = `

Sortierung der Reihentitel

` -const ABK_PATH = "data/abkuerzungen.txt" +const ABK_PATH = "./import/data/abkuerzungen.txt" func init() { m.Register(func(app core.App) error { diff --git a/pages/migrations_reihen/1739446703_insert_data_reihen.go b/pages/migrations_reihen/1739446703_insert_data_reihen.go index dff973c..14ac8a3 100644 --- a/pages/migrations_reihen/1739446703_insert_data_reihen.go +++ b/pages/migrations_reihen/1739446703_insert_data_reihen.go @@ -9,7 +9,7 @@ import ( const START = "

Ziel der Musenalm ist die bibliographische Erfassung eines Jahrhunderts deutscher Almanache und Taschenbücher; das Projekt ist im Aufbau und wird kontinuierlich weitergeführt.

Verzeichnet werden:

Die Bibliographie ist zugänglich mit umfangreichen Suchfunktionen über:

Die Musenalm ist ein Projekt der Theodor Springmann Stiftung in Heidelberg.

" -const START_BILD = "./Static-Bilder/musen.png" +const START_BILD = "./import/Static-Bilder/musen.png" func init() { m.Register(func(app core.App) error { diff --git a/pages/person.go b/pages/person.go index 6bc135b..17840e1 100644 --- a/pages/person.go +++ b/pages/person.go @@ -2,6 +2,8 @@ package pages import ( "database/sql" + "maps" + "slices" "github.com/Theodor-Springmann-Stiftung/musenalm/app" "github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels" @@ -194,10 +196,15 @@ func (p *AgentResult) FilterContentsByEntry(app core.App, id string, res *AgentR } res.Contents = contentMap + for _, c := range contentMap { + dbmodels.Sort_Contents_Numbering(c) + } + entries, err := dbmodels.Entries_IDs(app, entrykeys) if err != nil { return err } + dbmodels.Sort_Entries_Year_Title(entries) res.CResult = entries return nil @@ -212,5 +219,24 @@ func (p *AgentResult) LenSeries() int { } func (p *AgentResult) LenContents() int { - return len(p.Contents) + i := 0 + for _, c := range p.Contents { + i += len(c) + } + return i +} + +func (p *AgentResult) Types() []string { + types := make(map[string]bool) + + // INFO: this is just a handful of entries usuallly so we're fine + for _, c := range p.Contents { + for _, c := range c { + for _, c := range c.MusenalmType() { + types[c] = true + } + } + } + + return slices.Collect(maps.Keys(types)) } diff --git a/pages/reihen.go b/pages/reihen.go index 7348434..c62f082 100644 --- a/pages/reihen.go +++ b/pages/reihen.go @@ -283,6 +283,10 @@ func NewSeriesListResult_Letter(app core.App, letter string) (*SeriesListResult, entriesMap[e.Id] = e } + for _, r := range relationsMap { + dbmodels.Sort_REntriesSeries_Year(r, entriesMap) + } + return &SeriesListResult{ Series: series, Entries: entriesMap, diff --git a/scratchpad.md b/scratchpad.md index cbbb7d9..2b3caa7 100644 --- a/scratchpad.md +++ b/scratchpad.md @@ -61,17 +61,9 @@ TODO danach: - Cache? -- Link größer Einzelansicht -- Download button Lightbox -- Personen Liste Inhalte Abstand - HTMX + Smooth scroll -- Brreadcrumb link Reihentitel -- Inhalt -> Beiträge - +- Personen: related +- Inhaltsliste: Personen sehen komisch aus +- Sammlungen neuer versuch - Inhaltsliste Personen - - Einklappen - - Linke Spalte weg - - Sortierung - Sortierung nach Band A-Z? - -- Sortierung Startseite diff --git a/views/routes/almanach/body.gohtml b/views/routes/almanach/body.gohtml index 40bef19..a3c7b41 100644 --- a/views/routes/almanach/body.gohtml +++ b/views/routes/almanach/body.gohtml @@ -34,7 +34,8 @@ {{- range $i, $s := $model.result.Series -}}
- Reihentitel + Reihen +
{{ $s.Title }} diff --git a/views/routes/components/_content.gohtml b/views/routes/components/_content.gohtml index 120fd6a..2a64749 100644 --- a/views/routes/components/_content.gohtml +++ b/views/routes/components/_content.gohtml @@ -22,8 +22,10 @@ {{- end -}} -
- {{- if not $singleView -}} +
+ {{- if and (not $singleView) (not $entrySubView) -}}
{{- if $content.Extent -}}
@@ -126,16 +128,27 @@ {{- end -}}
-
+
NR {{ $content.MusenalmID -}}
-
+ {{- if $entrySubView -}} + {{- if $content.MusenalmType -}} +
+ {{- range $_, $t := $content.MusenalmType -}} +
+ {{- $t -}} +
+ {{- end -}} +
+ {{- end -}} + {{- end -}} +
- Einzelansicht + Link
diff --git a/views/routes/components/_reihe.gohtml b/views/routes/components/_reihe.gohtml index 4fae78b..039a9dc 100644 --- a/views/routes/components/_reihe.gohtml +++ b/views/routes/components/_reihe.gohtml @@ -27,9 +27,9 @@
{{ end }} {{ end }} -
+
- Permalink + Link
diff --git a/views/routes/components/_reiherelations.gohtml b/views/routes/components/_reiherelations.gohtml index e93f74e..a7e48d1 100644 --- a/views/routes/components/_reiherelations.gohtml +++ b/views/routes/components/_reiherelations.gohtml @@ -19,6 +19,23 @@ {{- else -}} [o.J.] {{- end -}} + + {{- if not $bd.TitleStmt -}} + + +
Keine nähere Erfassung
+ + {{- else if eq $bd.EditState "Edited" -}} + + +
Mit erfassten Beiträgen
+ + {{- else -}} + + +
Mit genaueren Titelangaben
+ + {{- end -}}
{{- if not (eq $rel.Type "Bevorzugter Reihentitel") -}}
diff --git a/views/routes/person/body.gohtml b/views/routes/person/body.gohtml index 6de41d5..63d46e9 100644 --- a/views/routes/person/body.gohtml +++ b/views/routes/person/body.gohtml @@ -20,7 +20,9 @@