From 6e2aa51092871e8307b3b6145ebd872706aaf113 Mon Sep 17 00:00:00 2001 From: Simon Martens Date: Wed, 21 May 2025 21:47:30 +0200 Subject: [PATCH] deleted bad migfration structure --- .../1739220544_index.go | 2 +- .../1739220544_kabinett.go | 22 ++++---- .../1739226078_insert_data_index.go | 9 +-- .../1739446527_danksagungen.go | 10 ++-- .../1739446527_dokumentation.go | 10 ++-- .../1739446527_einfuehrung.go | 10 ++-- .../1739446527_kontakt.go | 10 ++-- .../1739446527_literatur.go | 10 ++-- .../1739446527_reihen.go | 6 +- .../1739446703_insert_data_danksagungen.go | 2 +- .../1739446703_insert_data_dokumentation.go | 14 +++-- .../1739446703_insert_data_einfuehrung.go | 14 +++-- .../1739446703_insert_data_kontakt.go | 14 ++--- .../1739446703_insert_data_literatur.go | 14 +++-- migrations/1739446703_insert_data_reihen.go | 55 +++++++++++++++++++ musenalm.go | 8 --- .../1739446703_insert_data_reihen.go | 53 ------------------ 17 files changed, 133 insertions(+), 130 deletions(-) rename {pages/migrations_index => migrations}/1739220544_index.go (98%) rename {pages/migrations_lesekabinett => migrations}/1739220544_kabinett.go (89%) rename pages/migrations_index/1739226078_insert_data.go => migrations/1739226078_insert_data_index.go (96%) rename {pages/migrations_danksagungen => migrations}/1739446527_danksagungen.go (83%) rename {pages/migrations_dokumentation => migrations}/1739446527_dokumentation.go (90%) rename {pages/migrations_einfuehrung => migrations}/1739446527_einfuehrung.go (83%) rename {pages/migrations_kontakt => migrations}/1739446527_kontakt.go (82%) rename {pages/migrations_literatur => migrations}/1739446527_literatur.go (83%) rename {pages/migrations_reihen => migrations}/1739446527_reihen.go (91%) rename {pages/migrations_danksagungen => migrations}/1739446703_insert_data_danksagungen.go (99%) rename {pages/migrations_dokumentation => migrations}/1739446703_insert_data_dokumentation.go (97%) rename {pages/migrations_einfuehrung => migrations}/1739446703_insert_data_einfuehrung.go (97%) rename {pages/migrations_kontakt => migrations}/1739446703_insert_data_kontakt.go (65%) rename {pages/migrations_literatur => migrations}/1739446703_insert_data_literatur.go (98%) create mode 100644 migrations/1739446703_insert_data_reihen.go delete mode 100644 pages/migrations_reihen/1739446703_insert_data_reihen.go diff --git a/pages/migrations_index/1739220544_index.go b/migrations/1739220544_index.go similarity index 98% rename from pages/migrations_index/1739220544_index.go rename to migrations/1739220544_index.go index 639d63b..ca72fbc 100644 --- a/pages/migrations_index/1739220544_index.go +++ b/migrations/1739220544_index.go @@ -1,4 +1,4 @@ -package migrations_index +package migrations import ( "github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels" diff --git a/pages/migrations_lesekabinett/1739220544_kabinett.go b/migrations/1739220544_kabinett.go similarity index 89% rename from pages/migrations_lesekabinett/1739220544_kabinett.go rename to migrations/1739220544_kabinett.go index eca6bbb..e9e1829 100644 --- a/pages/migrations_lesekabinett/1739220544_kabinett.go +++ b/migrations/1739220544_kabinett.go @@ -1,4 +1,4 @@ -package migrations_index +package migrations import ( "github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels" @@ -6,9 +6,11 @@ import ( m "github.com/pocketbase/pocketbase/migrations" ) -const BESCHREIBUNG = "Musenalm: Verzeichnis deutschsprachiger Almanache des 18. und 19. Jahrhunderts. Historische Texte zum Almanachwesen." +const KABINETT_NAME = "Lesekabinett" -var text = `

Texte zum Almanachwesen

+const KABINETT_BESCHREIBUNG = "Musenalm: Verzeichnis deutschsprachiger Almanache des 18. und 19. Jahrhunderts. Historische Texte zum Almanachwesen." + +const KABINETT_TEXT = `

Texte zum Almanachwesen

Joseph Franz von Ratschky: Vorbericht. in: Wiener Musenalmanach. 1779, S. 3-6. [↓Download]

Gottfried August Bürger: Nothgedrungene Nachrede. in: Göttinger Musenalmanach. 1782, S. 184-192. [↓Download]

Christian Cay Lorenz Hirschfeld: An die Leser. in: Gartenkalender. 1783, S. 272. [↓Download]

@@ -25,22 +27,22 @@ var text = `

Texte zum Almanachwesen

Allotria und Kuriosa

Anonymus: Woher das Wort Almanach komme. in: Neues Wochenblatt zum Nuzzen und zur Unterhaltung für Kinder und junge Leute. Erstes Bändchen, erstes Stück, Leipzig, in der Sommerschen Buchhandlung 1794, S. 8f. [↓Download]

` -var texte_fields = core.NewFieldsList( +var kabinett_fields = core.NewFieldsList( pagemodels.EditorField(pagemodels.F_TEXT), ) func init() { m.Register(func(app core.App) error { - collection_t := texteCollection() + collection_t := kabinettCollection() if err := app.Save(collection_t); err != nil { return err } r := core.NewRecord(collection_t) page := pagemodels.NewTextPage(r) - page.SetText(text) - page.SetTitle("Lesekabinett") - page.SetDescription(BESCHREIBUNG) + page.SetText(KABINETT_TEXT) + page.SetTitle(KABINETT_NAME) + page.SetDescription(KABINETT_BESCHREIBUNG) if err := app.Save(r); err != nil { return err @@ -59,8 +61,8 @@ func init() { }) } -func texteCollection() *core.Collection { +func kabinettCollection() *core.Collection { c := pagemodels.BasePageCollection(pagemodels.P_KABINETT_NAME) - c.Fields = append(c.Fields, texte_fields...) + c.Fields = append(c.Fields, kabinett_fields...) return c } diff --git a/pages/migrations_index/1739226078_insert_data.go b/migrations/1739226078_insert_data_index.go similarity index 96% rename from pages/migrations_index/1739226078_insert_data.go rename to migrations/1739226078_insert_data_index.go index 1d08163..019eb29 100644 --- a/pages/migrations_index/1739226078_insert_data.go +++ b/migrations/1739226078_insert_data_index.go @@ -1,4 +1,4 @@ -package migrations_index +package migrations import ( "bufio" @@ -18,7 +18,8 @@ const ABS1 = "

Die Epoche der Almanache und Taschenbücher in der deutschsprac const ABS2 = "Die laufend aktualisierte Datenbank erfasst die Almanache nach Reihen, Personen und verschiedenen Arten von Beiträgen — Textbeiträgen, Graphiken oder Musikbeiträgen. Umfangreiche Suchfunktionen helfen bei der Erschließung des Materials." -const BESCHREIBUNG = "Musenalm: Verzeichnis deutschsprachiger Almanache des 18. und 19. Jahrhunderts." +const START_TITLE = "Musenalm" +const START_BESCHREIBUNG = "Musenalm: Verzeichnis deutschsprachiger Almanache des 18. und 19. Jahrhunderts." func init() { m.Register(func(app core.App) error { @@ -37,10 +38,10 @@ func init() { } text := pagemodels.NewIndexTexte(core.NewRecord(index_collection)) - text.SetTitle("Musenalm") + text.SetTitle(START_TITLE) text.SetAbs1(ABS1) text.SetAbs2(ABS2) - text.SetDescription(BESCHREIBUNG) + text.SetDescription(START_BESCHREIBUNG) if err := app.Save(text); err != nil { app.Logger().Error("Failed to save text:", "error", err, "text", text) diff --git a/pages/migrations_danksagungen/1739446527_danksagungen.go b/migrations/1739446527_danksagungen.go similarity index 83% rename from pages/migrations_danksagungen/1739446527_danksagungen.go rename to migrations/1739446527_danksagungen.go index b606b37..1a87bb9 100644 --- a/pages/migrations_danksagungen/1739446527_danksagungen.go +++ b/migrations/1739446527_danksagungen.go @@ -1,4 +1,4 @@ -package migrations_danksagungen +package migrations import ( "github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels" @@ -7,13 +7,13 @@ import ( m "github.com/pocketbase/pocketbase/migrations" ) -var reihen_fields = core.NewFieldsList( +var dank_fields = core.NewFieldsList( pagemodels.EditorField(pagemodels.F_TEXT), ) func init() { m.Register(func(app core.App) error { - collection := pageCollection() + collection := dankCollection() if err := app.Save(collection); err != nil { app.Logger().Error("Failed to save collection:", "error", err, "collection", collection) return err @@ -32,9 +32,9 @@ func init() { }) } -func pageCollection() *core.Collection { +func dankCollection() *core.Collection { c := pagemodels.BasePageCollection(pagemodels.P_DANK_NAME) - c.Fields = append(c.Fields, reihen_fields...) + c.Fields = append(c.Fields, dank_fields...) dbmodels.SetBasicPublicRules(c) return c } diff --git a/pages/migrations_dokumentation/1739446527_dokumentation.go b/migrations/1739446527_dokumentation.go similarity index 90% rename from pages/migrations_dokumentation/1739446527_dokumentation.go rename to migrations/1739446527_dokumentation.go index 97a707c..840230a 100644 --- a/pages/migrations_dokumentation/1739446527_dokumentation.go +++ b/migrations/1739446527_dokumentation.go @@ -1,4 +1,4 @@ -package migrations_dokumentation +package migrations import ( "errors" @@ -9,13 +9,13 @@ import ( m "github.com/pocketbase/pocketbase/migrations" ) -var reihen_fields = core.NewFieldsList( +var dok_fields = core.NewFieldsList( pagemodels.EditorField(pagemodels.F_TEXT), ) func init() { m.Register(func(app core.App) error { - collection := pageCollection() + collection := dokCollection() if err := app.Save(collection); err != nil { app.Logger().Error("Failed to save collection:", "error", err, "collection", collection) return err @@ -48,9 +48,9 @@ func init() { }) } -func pageCollection() *core.Collection { +func dokCollection() *core.Collection { c := pagemodels.BasePageCollection(pagemodels.P_DOK_NAME) - c.Fields = append(c.Fields, reihen_fields...) + c.Fields = append(c.Fields, dok_fields...) return c } diff --git a/pages/migrations_einfuehrung/1739446527_einfuehrung.go b/migrations/1739446527_einfuehrung.go similarity index 83% rename from pages/migrations_einfuehrung/1739446527_einfuehrung.go rename to migrations/1739446527_einfuehrung.go index a0a1191..1b31540 100644 --- a/pages/migrations_einfuehrung/1739446527_einfuehrung.go +++ b/migrations/1739446527_einfuehrung.go @@ -1,4 +1,4 @@ -package migrations_einfuehrung +package migrations import ( "github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels" @@ -7,13 +7,13 @@ import ( m "github.com/pocketbase/pocketbase/migrations" ) -var reihen_fields = core.NewFieldsList( +var einf_fields = core.NewFieldsList( pagemodels.EditorField(pagemodels.F_TEXT), ) func init() { m.Register(func(app core.App) error { - collection := pageCollection() + collection := einfCollection() if err := app.Save(collection); err != nil { app.Logger().Error("Failed to save collection:", "error", err, "collection", collection) return err @@ -32,9 +32,9 @@ func init() { }) } -func pageCollection() *core.Collection { +func einfCollection() *core.Collection { c := pagemodels.BasePageCollection(pagemodels.P_EINFUEHRUNG_NAME) - c.Fields = append(c.Fields, reihen_fields...) + c.Fields = append(c.Fields, einf_fields...) dbmodels.SetBasicPublicRules(c) return c } diff --git a/pages/migrations_kontakt/1739446527_kontakt.go b/migrations/1739446527_kontakt.go similarity index 82% rename from pages/migrations_kontakt/1739446527_kontakt.go rename to migrations/1739446527_kontakt.go index f674937..4dd5f94 100644 --- a/pages/migrations_kontakt/1739446527_kontakt.go +++ b/migrations/1739446527_kontakt.go @@ -1,4 +1,4 @@ -package migrations_kontakt +package migrations import ( "github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels" @@ -6,13 +6,13 @@ import ( m "github.com/pocketbase/pocketbase/migrations" ) -var reihen_fields = core.NewFieldsList( +var kontakt_fields = core.NewFieldsList( pagemodels.EditorField(pagemodels.F_TEXT), ) func init() { m.Register(func(app core.App) error { - collection := pageCollection() + collection := kontaktCollection() if err := app.Save(collection); err != nil { app.Logger().Error("Failed to save collection:", "error", err, "collection", collection) return err @@ -31,8 +31,8 @@ func init() { }) } -func pageCollection() *core.Collection { +func kontaktCollection() *core.Collection { c := pagemodels.BasePageCollection(pagemodels.P_KONTAKT_NAME) - c.Fields = append(c.Fields, reihen_fields...) + c.Fields = append(c.Fields, kontakt_fields...) return c } diff --git a/pages/migrations_literatur/1739446527_literatur.go b/migrations/1739446527_literatur.go similarity index 83% rename from pages/migrations_literatur/1739446527_literatur.go rename to migrations/1739446527_literatur.go index bf03f7f..bbb81cc 100644 --- a/pages/migrations_literatur/1739446527_literatur.go +++ b/migrations/1739446527_literatur.go @@ -1,4 +1,4 @@ -package migrations_literatur +package migrations import ( "github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels" @@ -7,13 +7,13 @@ import ( m "github.com/pocketbase/pocketbase/migrations" ) -var reihen_fields = core.NewFieldsList( +var lit_fields = core.NewFieldsList( pagemodels.EditorField(pagemodels.F_TEXT), ) func init() { m.Register(func(app core.App) error { - collection := pageCollection() + collection := litCollection() if err := app.Save(collection); err != nil { app.Logger().Error("Failed to save collection:", "error", err, "collection", collection) return err @@ -32,9 +32,9 @@ func init() { }) } -func pageCollection() *core.Collection { +func litCollection() *core.Collection { c := pagemodels.BasePageCollection(pagemodels.P_LIT_NAME) - c.Fields = append(c.Fields, reihen_fields...) + c.Fields = append(c.Fields, lit_fields...) dbmodels.SetBasicPublicRules(c) return c } diff --git a/pages/migrations_reihen/1739446527_reihen.go b/migrations/1739446527_reihen.go similarity index 91% rename from pages/migrations_reihen/1739446527_reihen.go rename to migrations/1739446527_reihen.go index eb4fba9..1fc4547 100644 --- a/pages/migrations_reihen/1739446527_reihen.go +++ b/migrations/1739446527_reihen.go @@ -1,4 +1,4 @@ -package migrations_reihen +package migrations import ( "github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels" @@ -14,7 +14,7 @@ var reihen_fields = core.NewFieldsList( func init() { m.Register(func(app core.App) error { - collection := pageCollection() + collection := reihenCollection() if err := app.Save(collection); err != nil { app.Logger().Error("Failed to save collection:", "error", err, "collection", collection) return err @@ -33,7 +33,7 @@ func init() { }) } -func pageCollection() *core.Collection { +func reihenCollection() *core.Collection { c := pagemodels.BasePageCollection(pagemodels.P_REIHEN_NAME) c.Fields = append(c.Fields, reihen_fields...) dbmodels.SetBasicPublicRules(c) diff --git a/pages/migrations_danksagungen/1739446703_insert_data_danksagungen.go b/migrations/1739446703_insert_data_danksagungen.go similarity index 99% rename from pages/migrations_danksagungen/1739446703_insert_data_danksagungen.go rename to migrations/1739446703_insert_data_danksagungen.go index b8334c1..6c571c0 100644 --- a/pages/migrations_danksagungen/1739446703_insert_data_danksagungen.go +++ b/migrations/1739446703_insert_data_danksagungen.go @@ -1,4 +1,4 @@ -package migrations_danksagungen +package migrations import ( "github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels" diff --git a/pages/migrations_dokumentation/1739446703_insert_data_dokumentation.go b/migrations/1739446703_insert_data_dokumentation.go similarity index 97% rename from pages/migrations_dokumentation/1739446703_insert_data_dokumentation.go rename to migrations/1739446703_insert_data_dokumentation.go index fa4be5f..c714082 100644 --- a/pages/migrations_dokumentation/1739446703_insert_data_dokumentation.go +++ b/migrations/1739446703_insert_data_dokumentation.go @@ -1,4 +1,4 @@ -package migrations_dokumentation +package migrations import ( "bufio" @@ -12,9 +12,11 @@ import ( m "github.com/pocketbase/pocketbase/migrations" ) -const BESCHREIBUNG = "Musenalm: Verzeichnis deutschsprachiger Almanache des 18. und 19. Jahrhunderts. Dokumentation der Sortierung und Struktur der Almanache." +const DOK_TITLE = "Benutzerhinweise" -const START = `

Sortierung der Reihentitel

+const DOK_BESCHREIBUNG = "Musenalm: Verzeichnis deutschsprachiger Almanache des 18. und 19. Jahrhunderts. Dokumentation der Sortierung und Struktur der Almanache." + +const DOK_TEXT = `

Sortierung der Reihentitel

Wir sortieren die Reihentitel nach dem Kopf der Nominalphrase, den wir zu diesem Zweck ggf. an den Anfang stellen und mit Kommas abtrennen.

Somit wird:

Wiener Musenalmach

@@ -494,9 +496,9 @@ func init() { } record := pagemodels.NewTextPage(core.NewRecord(collection)) - record.SetTitle("Benutzerhinweise") - record.SetText(START) - record.SetDescription(BESCHREIBUNG) + record.SetTitle(DOK_TITLE) + record.SetText(DOK_TEXT) + record.SetDescription(DOK_BESCHREIBUNG) if err := app.Save(record); err != nil { app.Logger().Error("Failed to save record", "error", err, "record", record) diff --git a/pages/migrations_einfuehrung/1739446703_insert_data_einfuehrung.go b/migrations/1739446703_insert_data_einfuehrung.go similarity index 97% rename from pages/migrations_einfuehrung/1739446703_insert_data_einfuehrung.go rename to migrations/1739446703_insert_data_einfuehrung.go index eb6743e..caded90 100644 --- a/pages/migrations_einfuehrung/1739446703_insert_data_einfuehrung.go +++ b/migrations/1739446703_insert_data_einfuehrung.go @@ -1,4 +1,4 @@ -package migrations_einfuehrung +package migrations import ( "github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels" @@ -6,9 +6,11 @@ import ( m "github.com/pocketbase/pocketbase/migrations" ) -const BESCHREIBUNG = "Musenalm: Einführung in das Verzeichnis deutschsprachiger Almanache." +const EINF_NAME = "Einleitung" -const START = `

Vorbemerkung

+const EINF_BESCHREIBUNG = "Musenalm: Einführung in das Verzeichnis deutschsprachiger Almanache." + +const EINF_TEXT = `

Vorbemerkung

Dies ist eine Bibliographie der deutschen Almanache und Taschenbücher, die neben der Erfassung der Reihen und ihrer Jahrgänge die Inhalte selbst erkennbar macht. In der Regel werden folgende Merkmale erfaßt und sind in verschiedenen Suchabfragen und Listen abrufbar: