Personen DB Abfragen + Seiten

dbmodels/agent.go

@@ -1,11 +1,7 @@
 package dbmodels
 
 import (
-	"slices"
-
 	"github.com/pocketbase/pocketbase/core"
-	"golang.org/x/text/collate"
-	"golang.org/x/text/language"
 )
 
 var _ core.RecordProxy = (*Agent)(nil)
@@ -115,10 +111,3 @@ func (a *Agent) SetEditState(editState string) {
 func (a *Agent) Comment() string {
 	return a.GetString(COMMENT_FIELD)
 }
-
-func SortAgentsByName(series []*Agent) {
-	collator := collate.New(language.German)
-	slices.SortFunc(series, func(i, j *Agent) int {
-		return collator.CompareString(i.Name(), j.Name())
-	})
-}

dbmodels/agents.go

@@ -1,10 +1,17 @@
 package dbmodels
 
 import (
+	"slices"
+
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/core"
+	"golang.org/x/text/collate"
+	"golang.org/x/text/language"
 )
 
+type AgentsEntries map[string][]*REntriesAgents
+type AgentsContents map[string][]*RContentsAgents
+
 func AgentForId(app core.App, id string) (*Agent, error) {
 	agent := &Agent{}
 	err := app.RecordQuery(AGENTS_TABLE).
@@ -15,3 +22,193 @@ func AgentForId(app core.App, id string) (*Agent, error) {
 	}
 	return agent, nil
 }
+
+func AgentsForEntries(app core.App, entries []*Entry) (map[string]*Agent, AgentsEntries, error) {
+	eids := []any{}
+	for _, e := range entries {
+		eids = append(eids, e.Id)
+	}
+
+	relations := []*REntriesAgents{}
+	err := app.RecordQuery(RelationTableName(ENTRIES_TABLE, AGENTS_TABLE)).
+		Where(dbx.HashExp{ENTRIES_TABLE: eids}).
+		All(&relations)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	agentIds := []any{}
+	for _, r := range relations {
+		agentIds = append(agentIds, r.Agent())
+	}
+
+	agents := []*Agent{}
+	err = app.RecordQuery(AGENTS_TABLE).
+		Where(dbx.HashExp{ID_FIELD: agentIds}).
+		All(&agents)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	agentsMap := make(map[string]*Agent, len(agents))
+	for _, a := range agents {
+		agentsMap[a.Id] = a
+	}
+
+	relationMap := make(map[string][]*REntriesAgents, len(entries))
+	for _, r := range relations {
+		relationMap[r.Entry()] = append(relationMap[r.Entry()], r)
+	}
+
+	return agentsMap, relationMap, nil
+}
+
+func AgentsForContents(app core.App, contents []*Content) (map[string]*Agent, AgentsContents, error) {
+	cids := []any{}
+	for _, c := range contents {
+		cids = append(cids, c.Id)
+	}
+
+	relations := []*RContentsAgents{}
+	err := app.RecordQuery(RelationTableName(CONTENTS_TABLE, AGENTS_TABLE)).
+		Where(dbx.HashExp{CONTENTS_TABLE: cids}).
+		All(&relations)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	agentIds := []any{}
+	for _, r := range relations {
+		agentIds = append(agentIds, r.Agent())
+	}
+
+	agents := []*Agent{}
+	err = app.RecordQuery(AGENTS_TABLE).
+		Where(dbx.HashExp{ID_FIELD: agentIds}).
+		All(&agents)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	agentsMap := make(map[string]*Agent, len(agents))
+	for _, a := range agents {
+		agentsMap[a.Id] = a
+	}
+
+	relationMap := make(map[string][]*RContentsAgents, len(contents))
+	for _, r := range relations {
+		relationMap[r.Content()] = append(relationMap[r.Content()], r)
+	}
+
+	return agentsMap, relationMap, nil
+}
+
+func LettersForAgents(app core.App) ([]string, error) {
+	letters := []core.Record{}
+	ids := []string{}
+
+	err := app.RecordQuery(AGENTS_TABLE).
+		Select("upper(substr(" + AGENTS_NAME_FIELD + ", 1, 1)) AS id").
+		Distinct(true).
+		All(&letters)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, l := range letters {
+		ids = append(ids, l.GetString("id"))
+	}
+
+	collator := collate.New(language.German, collate.Loose)
+	collator.SortStrings(ids)
+
+	return ids, nil
+}
+
+func AgentsForLetter(app core.App, letter string) ([]*Agent, error) {
+	agents := []*Agent{}
+	err := app.RecordQuery(AGENTS_TABLE).
+		Where(dbx.Like(AGENTS_NAME_FIELD, letter).Match(false, true)).
+		OrderBy(AGENTS_NAME_FIELD).
+		All(&agents)
+	if err != nil {
+		return nil, err
+	}
+
+	return agents, nil
+}
+
+func SortAgentsByName(series []*Agent) {
+	collator := collate.New(language.German, collate.Loose)
+	slices.SortFunc(series, func(i, j *Agent) int {
+		return collator.CompareString(i.Name(), j.Name())
+	})
+}
+
+func BasicSearchAgents(app core.App, query string) ([]*Agent, []*Agent, error) {
+	agents, err := TitleSearchAgents(app, query)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	altagents, err := AltSearchAgents(app, query)
+	if err != nil {
+		return nil, nil, err
+	}
+	return agents, altagents, nil
+}
+
+func TitleSearchAgents(app core.App, query string) ([]*Agent, error) {
+	agents := []*Agent{}
+	err := app.RecordQuery(AGENTS_TABLE).
+		Where(dbx.Like(AGENTS_NAME_FIELD, query).Match(true, true)).
+		OrWhere(dbx.Like(AGENTS_PSEUDONYMS_FIELD, query).Match(true, true)).
+		OrderBy(AGENTS_NAME_FIELD).
+		All(&agents)
+	if err != nil {
+		return nil, err
+	}
+
+	return agents, nil
+}
+
+func AltSearchAgents(app core.App, query string) ([]*Agent, error) {
+	agents := []*Agent{}
+	err := app.RecordQuery(AGENTS_TABLE).
+		Where(dbx.Like(ANNOTATION_FIELD, query).Match(true, true)).
+		OrderBy(AGENTS_NAME_FIELD).
+		All(&agents)
+	if err != nil {
+		return nil, err
+	}
+
+	return agents, nil
+}
+
+func AgentsForProfession(app core.App, profession string, letter string) ([]*Agent, error) {
+	agents := []*Agent{}
+	err := app.RecordQuery(AGENTS_TABLE).
+		Where(dbx.Like(AGENTS_NAME_FIELD, letter).Match(false, true)).
+		AndWhere(dbx.Like(AGENTS_PROFESSION_FIELD, profession).Match(true, true)).
+		OrderBy(AGENTS_NAME_FIELD).
+		All(&agents)
+	if err != nil {
+		return nil, err
+	}
+
+	return agents, nil
+}
+
+func AgentsForOrg(app core.App, org bool, letter string) ([]*Agent, error) {
+	agents := []*Agent{}
+	err := app.RecordQuery(AGENTS_TABLE).
+		Where(dbx.Like(AGENTS_NAME_FIELD, letter).Match(false, true)).
+		AndWhere(dbx.HashExp{AGENTS_CORP_FIELD: org}).
+		OrderBy(AGENTS_NAME_FIELD).
+		All(&agents)
+	if err != nil {
+		return nil, err
+	}
+
+	return agents, nil
+}

dbmodels/contents.go

@@ -0,0 +1,86 @@
+package dbmodels
+
+import (
+	"slices"
+	"strings"
+
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/core"
+)
+
+type ContentsAgents map[string][]*RContentsAgents
+
+func ContentsForEntry(app core.App, entry *Entry) ([]*Content, error) {
+	contents := []*Content{}
+	err := app.RecordQuery(CONTENTS_TABLE).
+		Where(dbx.HashExp{ENTRIES_TABLE: entry.Id}).
+		All(&contents)
+	if err != nil {
+		return nil, err
+	}
+
+	slices.SortFunc(contents, func(i, j *Content) int {
+		r := i.Numbering() - j.Numbering()
+		if r == 0 {
+			return 0
+		}
+		if r < 0 {
+			return -1
+		}
+		return 1
+	})
+
+	return contents, nil
+}
+
+func ContentsForAgent(app core.App, agentId string) ([]*Content, error) {
+	relations := []*RContentsAgents{}
+	err := app.RecordQuery(RelationTableName(CONTENTS_TABLE, AGENTS_TABLE)).
+		Where(dbx.HashExp{AGENTS_TABLE: agentId}).
+		All(&relations)
+	if err != nil {
+		return nil, err
+	}
+
+	cids := []any{}
+	for _, r := range relations {
+		cids = append(cids, r.Content())
+	}
+
+	contents := []*Content{}
+	err = app.RecordQuery(CONTENTS_TABLE).
+		Where(dbx.HashExp{ID_FIELD: cids}).
+		All(&contents)
+	if err != nil {
+		return nil, err
+	}
+
+	return contents, nil
+}
+
+func SortContentsByEntryNumbering(contents []*Content, entries map[string]*Entry) {
+	slices.SortFunc(contents, func(i, j *Content) int {
+		ii, iok := entries[i.Entry()]
+		ij, jok := entries[j.Entry()]
+		if iok && jok {
+			ret := ii.Year() - ij.Year()
+			if ret != 0 {
+				return ret
+			}
+
+			ret = strings.Compare(ii.PreferredTitle(), ij.PreferredTitle())
+			if ret != 0 {
+				return ret
+			}
+		}
+
+		r := i.Numbering() - j.Numbering()
+		if r == 0 {
+			return 0
+		}
+		if r < 0 {
+			return -1
+		}
+		return 1
+	})
+}

dbmodels/entries.go

@@ -88,3 +88,36 @@ func EntryForId(app core.App, id string) (*Entry, error) {
 	}
 	return entry, nil
 }
+
+func EntryForMusenalmID(app core.App, id string) (*Entry, error) {
+	entry := &Entry{}
+	err := app.RecordQuery(ENTRIES_TABLE).
+		Where(dbx.HashExp{MUSENALMID_FIELD: id}).
+		One(entry)
+	if err != nil {
+		return nil, err
+	}
+	return entry, nil
+}
+
+func EntriesForContents(app core.App, contents []*Content) (map[string]*Entry, error) {
+	cids := []any{}
+	for _, c := range contents {
+		cids = append(cids, c.Entry())
+	}
+
+	entries := []*Entry{}
+	err := app.RecordQuery(ENTRIES_TABLE).
+		Where(dbx.HashExp{ID_FIELD: cids}).
+		All(&entries)
+	if err != nil {
+		return nil, err
+	}
+
+	entriesMap := make(map[string]*Entry, len(entries))
+	for _, e := range entries {
+		entriesMap[e.Id] = e
+	}
+
+	return entriesMap, nil
+}

dbmodels/places.go

@@ -38,3 +38,29 @@ func PlaceForId(app core.App, id string) (*Place, error) {
 	}
 	return place, nil
 }
+
+func PlacesForEntry(app core.App, entry *Entry) (map[string]*Place, error) {
+	ids := []any{}
+	places := map[string]*Place{}
+
+	for _, r := range entry.Places() {
+		ids = append(ids, r)
+	}
+	if len(ids) == 0 {
+		return places, nil
+	}
+
+	p := []*Place{}
+	err := app.RecordQuery(PLACES_TABLE).
+		Where(dbx.HashExp{ID_FIELD: ids}).
+		All(&p)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, place := range p {
+		places[place.Id] = place
+	}
+
+	return places, nil
+}

dbmodels/seriesses.go

@@ -68,7 +68,7 @@ func IDsForSeriesses(series []*Series) []any {
 func makeMapForEnrySeries(relations []*REntriesSeries, entries map[string]*Entry) SeriesEntries {
 	m := map[string][]*REntriesSeries{}
 	for _, r := range relations {
-		m[r.Id] = append(m[r.Id], r)
+		m[r.Series()] = append(m[r.Series()], r)
 	}
 
 	for _, rel := range m {
@@ -111,8 +111,8 @@ func EntriesForSeriesses(app core.App, series []*Series) (
 
 	smap := map[string][]*REntriesSeries{}
 	for _, r := range relations {
-		series := NewREntriesSeries(r)
+		rel := NewREntriesSeries(r)
-		smap[series.Id] = append(smap[series.Id], series)
+		smap[rel.Series()] = append(smap[rel.Series()], rel)
 	}
 
 	for _, rel := range smap {

helpers/functions/templates.go

@@ -0,0 +1,5 @@
+package functions
+
+func Arr(els ...any) []any {
+	return els
+}

pages/404.go

@@ -0,0 +1,48 @@
+package pages
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/Theodor-Springmann-Stiftung/musenalm/app"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/templating"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/tools/router"
+)
+
+const URL_ERROR_404 = "/errors/404/"
+
+func init() {
+	rp := &Error404Page{
+		Page: pagemodels.Page{
+			Name: URL_ERROR_404,
+		},
+	}
+	app.Register(rp)
+}
+
+type Error404Page struct {
+	pagemodels.Page
+}
+
+func (p *Error404Page) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
+	router.GET(URL_ERROR_404, func(e *core.RequestEvent) error {
+		return Error404(e, engine, nil)
+	})
+	return nil
+}
+
+func Error404(e *core.RequestEvent, engine *templating.Engine, err error) error {
+	data := make(map[string]interface{})
+	var sb strings.Builder
+	if err != nil {
+		e.App.Logger().Error("404 error fetching URL!", "error", err, "request", e.Request.URL)
+		data["Error"] = err.Error()
+	}
+	err = engine.Render(&sb, URL_ERROR_404, data, "default")
+	if err != nil {
+		return e.String(http.StatusInternalServerError, err.Error())
+	}
+	return e.HTML(http.StatusNotFound, sb.String())
+}

pages/almanach.go

@@ -0,0 +1,99 @@
+package pages
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/Theodor-Springmann-Stiftung/musenalm/app"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/templating"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/tools/router"
+)
+
+const (
+	URL_ALMANACH      = "/almanach/{id}"
+	TEMPLATE_ALMANACH = "/almanach/"
+)
+
+func init() {
+	rp := &AlmanachPage{
+		Page: pagemodels.Page{
+			Name: pagemodels.P_REIHEN_NAME,
+		},
+	}
+	app.Register(rp)
+}
+
+type AlmanachPage struct {
+	pagemodels.Page
+}
+
+func (p *AlmanachPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
+	router.GET(URL_ALMANACH, func(e *core.RequestEvent) error {
+		id := e.Request.PathValue("id")
+		data := make(map[string]interface{})
+		entry, err := dbmodels.EntryForMusenalmID(app, id)
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+		data["entry"] = entry
+
+		series, srelations, _, err := dbmodels.SeriesForEntries(app, []*dbmodels.Entry{entry})
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+
+		s := map[string]*dbmodels.Series{}
+		for _, r := range series {
+			s[r.Id] = r
+		}
+
+		data["srelations"] = srelations
+		data["series"] = s
+
+		places, err := dbmodels.PlacesForEntry(app, entry)
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+		data["places"] = places
+
+		contents, err := dbmodels.ContentsForEntry(app, entry)
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+		data["contents"] = contents
+
+		agents, arelations, err := dbmodels.AgentsForEntries(app, []*dbmodels.Entry{entry})
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+		data["arelations"] = arelations
+
+		if len(contents) > 0 {
+			cagents, crelations, err := dbmodels.AgentsForContents(app, contents)
+			if err != nil {
+				return Error404(e, engine, err)
+			}
+			data["crelations"] = crelations
+			for k, v := range cagents {
+				agents[k] = v
+			}
+		}
+		data["agents"] = agents
+
+		return p.Get(e, engine, data)
+	})
+
+	return nil
+}
+
+func (p *AlmanachPage) Get(request *core.RequestEvent, engine *templating.Engine, data map[string]interface{}) error {
+	var builder strings.Builder
+	err := engine.Render(&builder, TEMPLATE_ALMANACH, data)
+	if err != nil {
+		return Error404(request, engine, err)
+	}
+	return request.HTML(http.StatusOK, builder.String())
+}

pages/index.go

@@ -24,14 +24,6 @@ type IndexPage struct {
 	pagemodels.Page
 }
 
-func (p *IndexPage) Up(app core.App) error {
-	return nil
-}
-
-func (p *IndexPage) Down(app core.App) error {
-	return nil
-}
-
 func (p *IndexPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
 	router.GET("/{$}", func(e *core.RequestEvent) error {
 		var builder strings.Builder

pages/person.go

@@ -0,0 +1,91 @@
+package pages
+
+import (
+	"strings"
+
+	"github.com/Theodor-Springmann-Stiftung/musenalm/app"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/templating"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/tools/router"
+)
+
+const (
+	URL_PERSON      = "/person/{id}"
+	TEMPLATE_PERSON = "/person/"
+)
+
+func init() {
+	rp := &PersonPage{
+		Page: pagemodels.Page{
+			Name: URL_PERSON,
+		},
+	}
+	app.Register(rp)
+}
+
+type PersonPage struct {
+	pagemodels.Page
+}
+
+func (p *PersonPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
+	router.GET(URL_PERSON, func(e *core.RequestEvent) error {
+		person := e.Request.PathValue("id")
+		data := make(map[string]interface{})
+		data[PARAM_PERSON] = person
+
+		agent, err := dbmodels.AgentForId(app, person)
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+		data["a"] = agent
+
+		series, relations, entries, err := dbmodels.SeriesForAgent(app, person)
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+
+		dbmodels.SortSeriessesByTitle(series)
+		data["series"] = series
+		data["relations"] = relations
+		data["entries"] = entries
+
+		contents, err := dbmodels.ContentsForAgent(app, person)
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+
+		agents, crelations, err := dbmodels.AgentsForContents(app, contents)
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+		data["agents"] = agents
+		data["crelations"] = crelations
+
+		centries, err := dbmodels.EntriesForContents(app, contents)
+		if err != nil {
+			return Error404(e, engine, err)
+		}
+		data["centries"] = centries
+
+		dbmodels.SortContentsByEntryNumbering(contents, centries)
+		data["contents"] = contents
+
+		return p.Get(e, engine, data)
+	})
+
+	return nil
+}
+
+func (p *PersonPage) Get(request *core.RequestEvent, engine *templating.Engine, data map[string]interface{}) error {
+	var builder strings.Builder
+	err := engine.Render(&builder, TEMPLATE_PERSON, data)
+	if err != nil {
+		return Error404(request, engine, err)
+	}
+
+	request.Response.Header().Set("Content-Type", "text/html")
+	request.Response.Write([]byte(builder.String()))
+	return nil
+}

pages/personen.go

@@ -0,0 +1,152 @@
+package pages
+
+import (
+	"net/http"
+	"strings"
+
+	"github.com/Theodor-Springmann-Stiftung/musenalm/app"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/pagemodels"
+	"github.com/Theodor-Springmann-Stiftung/musenalm/templating"
+	"github.com/pocketbase/pocketbase/core"
+	"github.com/pocketbase/pocketbase/tools/router"
+)
+
+const (
+	URL_PERSONEN = "/personen/"
+	PARAM_FILTER = "filter"
+)
+
+func init() {
+	rp := &PersonenPage{
+		Page: pagemodels.Page{
+			Name: pagemodels.P_REIHEN_NAME,
+		},
+	}
+	app.Register(rp)
+}
+
+type PersonenPage struct {
+	pagemodels.Page
+}
+
+func (p *PersonenPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
+	router.GET(URL_PERSONEN, func(e *core.RequestEvent) error {
+		if e.Request.URL.Query().Get(PARAM_SEARCH) != "" {
+			return p.SearchRequest(app, engine, e)
+		}
+		if e.Request.URL.Query().Get(PARAM_FILTER) != "" {
+			return p.FilterRequest(app, engine, e)
+		}
+
+		return p.LetterRequest(app, engine, e)
+	})
+
+	return nil
+}
+
+func (p *PersonenPage) CommonData(app core.App, data map[string]interface{}) error {
+	letters, err := dbmodels.LettersForAgents(app)
+	if err != nil {
+		return err
+	}
+	data["letters"] = letters
+
+	return nil
+}
+
+func (p *PersonenPage) FilterRequest(app core.App, engine *templating.Engine, e *core.RequestEvent) error {
+	filter := e.Request.URL.Query().Get(PARAM_FILTER)
+	letter := e.Request.URL.Query().Get(PARAM_LETTER)
+	if letter == "" {
+		letter = "A"
+	}
+	data := map[string]interface{}{}
+
+	var err error = nil
+	agents := []*dbmodels.Agent{}
+	if filter == "org" {
+		agents, err = dbmodels.AgentsForOrg(app, true, letter)
+	}
+
+	if filter == "noorg" {
+		agents, err = dbmodels.AgentsForOrg(app, false, letter)
+	}
+
+	if filter == "musik" {
+		agents, err = dbmodels.AgentsForProfession(app, "Musik", letter)
+	}
+
+	if filter == "autor" {
+		agents, err = dbmodels.AgentsForProfession(app, "Text", letter)
+	}
+
+	if filter == "graphik" {
+		agents, err = dbmodels.AgentsForProfession(app, "Graphik", letter)
+	}
+
+	if filter == "hrsg" {
+		agents, err = dbmodels.AgentsForProfession(app, "Hrsg", letter)
+	}
+
+	if err != nil {
+		return Error404(e, engine, err)
+	}
+	dbmodels.SortAgentsByName(agents)
+	data["agents"] = agents
+	data["filter"] = filter
+	data["letter"] = letter
+
+	return p.Get(e, engine, data)
+}
+
+func (p *PersonenPage) SearchRequest(app core.App, engine *templating.Engine, e *core.RequestEvent) error {
+	search := e.Request.URL.Query().Get(PARAM_SEARCH)
+	data := map[string]interface{}{}
+
+	agents, altagents, err := dbmodels.BasicSearchAgents(app, search)
+	if err != nil {
+		return Error404(e, engine, err)
+	}
+
+	dbmodels.SortAgentsByName(agents)
+	dbmodels.SortAgentsByName(altagents)
+
+	data["search"] = search
+	data["agents"] = agents
+	data["altagents"] = altagents
+
+	return p.Get(e, engine, data)
+}
+
+func (p *PersonenPage) LetterRequest(app core.App, engine *templating.Engine, e *core.RequestEvent) error {
+	letter := e.Request.URL.Query().Get(PARAM_LETTER)
+	if letter == "" {
+		letter = "A"
+	}
+	data := map[string]interface{}{}
+	data["letter"] = letter
+
+	agents, err := dbmodels.AgentsForLetter(app, letter)
+	if err != nil {
+		return Error404(e, engine, err)
+	}
+	dbmodels.SortAgentsByName(agents)
+	data["agents"] = agents
+
+	return p.Get(e, engine, data)
+}
+
+func (p *PersonenPage) Get(request *core.RequestEvent, engine *templating.Engine, data map[string]interface{}) error {
+	err := p.CommonData(request.App, data)
+	if err != nil {
+		return Error404(request, engine, err)
+	}
+
+	var builder strings.Builder
+	err = engine.Render(&builder, URL_PERSONEN, data)
+	if err != nil {
+		return Error404(request, engine, err)
+	}
+	return request.HTML(http.StatusOK, builder.String())
+}

pages/reihe.go

@@ -36,13 +36,13 @@ func (p *ReihePage) Setup(router *router.Router[*core.RequestEvent], app core.Ap
 		data := make(map[string]interface{})
 		reihe, err := dbmodels.SeriesForId(app, id)
 		if err != nil {
-			return err
+			return Error404(e, engine, err)
 		}
 		data["series"] = reihe
 
 		rmap, emap, err := dbmodels.EntriesForSeriesses(app, []*dbmodels.Series{reihe})
 		if err != nil {
-			return err
+			return Error404(e, engine, err)
 		}
 
 		data["relations"] = rmap
@@ -58,7 +58,7 @@ func (p *ReihePage) Get(request *core.RequestEvent, engine *templating.Engine, d
 	var builder strings.Builder
 	err := engine.Render(&builder, TEMPLATE_REIHE, data)
 	if err != nil {
-		return err
+		return Error404(request, engine, err)
 	}
 	return request.HTML(http.StatusOK, builder.String())
 }

pages/reihen.go

@@ -35,14 +35,6 @@ type ReihenPage struct {
 	pagemodels.Page
 }
 
-func (p *ReihenPage) Up(app core.App) error {
-	return nil
-}
-
-func (p *ReihenPage) Down(app core.App) error {
-	return nil
-}
-
 func (p *ReihenPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
 	router.GET(URL_REIHEN, func(e *core.RequestEvent) error {
 		search := e.Request.URL.Query().Get(PARAM_SEARCH)
@@ -64,6 +56,7 @@ func (p *ReihenPage) Setup(router *router.Router[*core.RequestEvent], app core.A
 
 		return p.LetterRequest(app, engine, e)
 	})
+
 	return nil
 }
 
@@ -74,12 +67,12 @@ func (p *ReihenPage) YearRequest(app core.App, engine *templating.Engine, e *cor
 
 	y, err := strconv.Atoi(year)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
 
 	series, relations, entries, err := dbmodels.SeriesForYear(app, y)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
 	data["entries"] = entries
 	data["relations"] = relations
@@ -98,7 +91,7 @@ func (p *ReihenPage) LetterRequest(app core.App, engine *templating.Engine, e *c
 
 	series, err := dbmodels.SeriesForLetter(app, letter)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
 	// INFO: We sort again since the query can't sort german umlauts correctly
 	dbmodels.SortSeriessesByTitle(series)
@@ -106,7 +99,7 @@ func (p *ReihenPage) LetterRequest(app core.App, engine *templating.Engine, e *c
 
 	rmap, bmap, err := dbmodels.EntriesForSeriesses(app, series)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
 	data["entries"] = bmap
 	data["relations"] = rmap
@@ -121,14 +114,15 @@ func (p *ReihenPage) PersonRequest(app core.App, engine *templating.Engine, e *c
 
 	agent, err := dbmodels.AgentForId(app, person)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
 	data["a"] = agent
 
 	series, relations, entries, err := dbmodels.SeriesForAgent(app, person)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
+	dbmodels.SortSeriessesByTitle(series)
 	data["series"] = series
 	data["relations"] = relations
 	data["entries"] = entries
@@ -143,13 +137,13 @@ func (p *ReihenPage) PlaceRequest(app core.App, engine *templating.Engine, e *co
 
 	pl, err := dbmodels.PlaceForId(app, place)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
 	data["p"] = pl
 
 	series, relations, entries, err := dbmodels.SeriesForPlace(app, place)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
 	data["series"] = series
 	data["relations"] = relations
@@ -164,7 +158,7 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
 	data[PARAM_SEARCH] = search
 	series, altseries, err := dbmodels.BasicSearchSeries(app, search)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
 	dbmodels.SortSeriessesByTitle(series)
 	dbmodels.SortSeriessesByTitle(altseries)
@@ -173,7 +167,7 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
 
 	rmap, bmap, err := dbmodels.EntriesForSeriesses(app, series)
 	if err != nil {
-		return err
+		return Error404(e, engine, err)
 	}
 	data["entries"] = bmap
 	data["relations"] = rmap
@@ -213,7 +207,7 @@ func (p *ReihenPage) CommonData(app core.App, data map[string]interface{}) error
 func (p *ReihenPage) Get(request *core.RequestEvent, engine *templating.Engine, data map[string]interface{}) error {
 	err := p.CommonData(request.App, data)
 	if err != nil {
-		return err
+		return Error404(request, engine, err)
 	}
 
 	var builder strings.Builder

scratchpad.md

@@ -21,3 +21,9 @@ Für einen Umzug:
 Alle PB-Abfragen die Record benutzen, nach sql-Abfragen umwandeln.
 Eigene DB-Connection
 Modelle umwandeln (zzt RecordProxy)
+
+
+- Abfragen Personen
+- Abfragen Person
+- Ersellen & Abfragen FTS5-Tabellen
+- Erstellen Textseiten

templating/engine.go

@@ -44,6 +44,7 @@ func (e *Engine) funcs() error {
 	e.mu.Lock()
 	e.mu.Unlock()
 	e.AddFunc("Safe", functions.Safe)
+	e.AddFunc("Arr", functions.Arr)
 	return nil
 }
 
@@ -101,6 +102,10 @@ func (e *Engine) AddFuncs(funcs map[string]interface{}) {
 
 func (e *Engine) Render(out io.Writer, path string, ld map[string]interface{}, layout ...string) error {
 	gd := e.GlobalData
+	if ld == nil {
+		ld = make(map[string]interface{})
+	}
+
 	// INFO: don't pollute the global data space
 	for k, v := range gd {
 		_, ok := ld[k]

views/layouts/components/_menu.gohtml

@@ -1 +1,4 @@
-<div class="flex flex-row justify-center mt-8"></div>
+<div class="flex flex-row justify-center mt-8 gap-x-2">
+	<a href="/reihen">Reihen</a>
+	<a href="/personen/">Personen</a>
+</div>

views/routes/almanach/body.gohtml

@@ -0,0 +1,3 @@
+{{ $model := . }}
+
+{{ $model.entry.TitleStmt }}

views/routes/almanach/head.gohtml

@@ -0,0 +1 @@
+<title>Musenalm - Reihen</title>

views/routes/components/_reihe.gohtml

@@ -0,0 +1,21 @@
+{{ $model := index . 0 }}
+{{ $r := index . 1 }}
+
+
+<a href="/reihe/{{ $r.MusenalmID }}">{{ $r.Title }}</a>
+<div>
+	{{ Safe $r.Annotation }}
+</div>
+<div>
+	{{ $bds := index $model.relations $r.Id }}
+	{{ if $bds }}
+		{{ range $_, $rel := $bds }}
+			{{ $bd := index $model.entries $rel.Entry }}
+			{{ if $bd }}
+				<div>
+					<a href="/almanach/{{ $bd.MusenalmID }}">{{ $bd.Year }}</a>
+				</div>
+			{{ end }}
+		{{ end }}
+	{{ end }}
+</div>

views/routes/errors/404/body.gohtml

@@ -0,0 +1,4 @@
+<h1>Die Seite konnte nicht gefunden werden!</h1>
+{{ if .Error }}
+	<p>{{ .Error }}</p>
+{{ end }}

views/routes/person/body.gohtml

@@ -0,0 +1,22 @@
+{{ $model := . }}
+
+{{ if .entries }}
+	<h2>Bände nach Riehentiteln</h2>
+	{{ range $id, $r := .series }}
+		<div>
+			{{ template "_reihe" (Arr $model $r) }}
+		</div>
+	{{ end }}
+{{ else }}
+	<div>Keine Bände</div>
+{{ end }}
+
+{{ if .contents }}
+	<h2>Inhalte</h2>
+	{{ range $id, $c := .contents }}
+		<div>
+			{{ $c.PreferredTitle }}
+			{{ $c.Numbering }}
+		</div>
+	{{ end }}
+{{ end }}

views/routes/personen/body.gohtml

@@ -0,0 +1,92 @@
+{{ $model := . }}
+
+{{ range $count, $letter := $model.letters }}
+	<a href="/personen?letter={{ $letter }}{{ if $model.filter }}&filter={{ $model.filter }}{{ end }}"
+		>{{ $letter }}</a
+	>
+{{ end }}
+
+
+<input
+	class="form-control"
+	type="search"
+	name="search"
+	placeholder="Suche"
+	hx-get="/personen"
+	hx-trigger="input changed delay:200ms, keyup[key=='Enter']"
+	hx-select="#agents"
+	hx-target="#agents" />
+
+<div>
+	<a href="/personen{{ if .letter }}?letter={{ .letter }}{{ end }}">Alle</a>
+	<a href="/personen?filter=org{{ if .letter }}&letter={{ .letter }}{{ end }}"
+		>Verlage u. Druckereien</a
+	>
+	<a href="/personen?filter=noorg{{ if .letter }}&letter={{ .letter }}{{ end }}">Personen</a>
+	<a href="/personen?filter=musik{{ if .letter }}&letter={{ .letter }}{{ end }}">Musiker:innen</a>
+	<a href="/personen?filter=autor{{ if .letter }}&letter={{ .letter }}{{ end }}">Autor:innen</a>
+	<a href="/personen?filter=graphik{{ if .letter }}&letter={{ .letter }}{{ end }}"
+		>Graphiker:innen</a
+	>
+	<a href="/personen?filter=hrsg{{ if .letter }}&letter={{ .letter }}{{ end }}"
+		>Herausgeber:innen</a
+	>
+</div>
+
+<div id="agents">
+	{{ if or .agents .altagents }}
+		{{ if .agents }}
+			<table class="w-full [&_td]:!align-top">
+				{{ range $count, $agent := .agents }}
+					<tr>
+						<td>
+							<a href="/person/{{ $agent.Id }}">
+								{{ $agent.Name }}
+								{{ if $agent.Pseudonyms }}
+									<br />
+									({{ $agent.Pseudonyms }})
+								{{ end }}
+							</a>
+						</td>
+						<td>
+							{{ if $agent.CorporateBody }}
+								Körperschaft
+							{{ else }}
+								{{ $agent.Profession }},
+								{{ $agent.BiographicalData }}
+							{{ end }}
+						</td>
+						<td>{{ $agent.References }}</td>
+					</tr>
+				{{ end }}
+
+			</table>
+		{{ end }}
+		{{ if .altagents }}
+			<table class="w-full mt-6">
+				{{ range $count, $agent := .altagents }}
+					<tr>
+						<td>
+							{{ $agent.Name }}
+							{{ if $agent.Pseudonyms }}
+								<br />
+								({{ $agent.Pseudonyms }})
+							{{ end }}
+						</td>
+						<td>
+							{{ if $agent.CorporateBody }}
+								Körperschaft
+							{{ else }}
+								{{ $agent.Profession }},
+								{{ $agent.BiographicalData }}
+							{{ end }}
+						</td>
+						<td>{{ $agent.References }}</td>
+					</tr>
+				{{ end }}
+			</table>
+		{{ end }}
+	{{ else }}
+		<p>Keine Personen gefunden.</p>
+	{{ end }}
+</div>

views/routes/reihen/body.gohtml

@@ -1,3 +1,5 @@
+{{ $model := . }}
+
 {{ if .letters }}
 	<div>
 		{{ range $id, $r := .letters }}
@@ -6,30 +8,44 @@
 	</div>
 {{ end }}
 
-{{ range $id, $r := .series }}
-	<div>
-		<a href="/reihe/{{ $r.MusenalmID }}">{{ $r.Title }}</a>
-		<div>
-			{{ Safe $r.Annotation }}
-		</div>
-	</div>
-{{ end }}
 
+<input
+	class="form-control"
+	type="search"
+	name="search"
+	placeholder="Suche"
+	hx-get="/reihen"
+	hx-trigger="input changed delay:=200ms, keyup[key=='Enter']"
+	hx-select="#series"
+	hx-target="#series" />
 
-<div class="flex flex-row">
+<div id="series">
-	{{ if .search }}
+	{{ if or .series .altseries }}
-		<div class="mt-8">
+		{{ range $id, $r := .series }}
-			{{ range $id, $r := .altseries }}
+			<div class="mb-1.5">
-				<div>
+				{{ template "_reihe" (Arr $model $r) }}
-					<a href="/reihe/{{ $r.MusenalmID }}">{{ $r.Title }}</a>
+			</div>
-					<div>
+		{{ end }}
-						{{ Safe $r.Annotation }}
+
+		{{ if .search }}
+			<div class="mt-8">
+				{{ range $id, $r := .altseries }}
+					<div class="mb-1.5">
+						{{ template "_reihe" (Arr $model $r) }}
 					</div>
-				</div>
+				{{ end }}
-			{{ end }}
+			</div>
+		{{ end }}
+	{{ else }}
+		<div class="mt-8">
+			Keine Reihen
+			{{ if .search }}für {{ .search }}{{ end }}
+			gefunden.
 		</div>
 	{{ end }}
+</div>
 
+<div class="flex flex-row">
 	{{ if .agents }}
 		<div class="mt-8">
 			{{ range $id, $r := .agents }}
@@ -65,5 +81,4 @@
 			{{ end }}
 		</div>
 	{{ end }}
-
 </div>