Some changes, path specific data

pages/404.go

@@ -1,9 +1,6 @@
 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"
@@ -12,9 +9,10 @@ import (
 )
 
 const URL_ERROR_404 = "/errors/404/"
+const URL_ERROR_500 = "/errors/500/"
 
 func init() {
-	rp := &Error404Page{
+	rp := &ErrorPage{
 		Page: pagemodels.Page{
 			Name: URL_ERROR_404,
 		},
@@ -22,27 +20,20 @@ func init() {
 	app.Register(rp)
 }
 
-type Error404Page struct {
+type ErrorPage struct {
 	pagemodels.Page
 }
 
-func (p *Error404Page) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
+func (p *ErrorPage) 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 engine.Response404(e, nil, nil)
+	})
+	router.GET(URL_ERROR_500, func(e *core.RequestEvent) error {
+		return engine.Response500(e, nil, 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())
+func Error404(e *core.RequestEvent, engine *templating.Engine, err error, data map[string]interface{}) error {
+	return engine.Response404(e, err, data)
 }

pages/almanach.go

@@ -1,9 +1,6 @@
 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"
@@ -36,13 +33,13 @@ func (p *AlmanachPage) Setup(router *router.Router[*core.RequestEvent], app core
 		data := make(map[string]interface{})
 		entry, err := dbmodels.EntryForMusenalmID(app, id)
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 		data["entry"] = entry
 
 		series, srelations, _, err := dbmodels.SeriesForEntries(app, []*dbmodels.Entry{entry})
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 
 		s := map[string]*dbmodels.Series{}
@@ -55,26 +52,26 @@ func (p *AlmanachPage) Setup(router *router.Router[*core.RequestEvent], app core
 
 		places, err := dbmodels.PlacesForEntry(app, entry)
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 		data["places"] = places
 
 		contents, err := dbmodels.ContentsForEntry(app, entry)
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 		data["contents"] = contents
 
 		agents, arelations, err := dbmodels.AgentsForEntries(app, []*dbmodels.Entry{entry})
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 		data["arelations"] = arelations
 
 		if len(contents) > 0 {
 			cagents, crelations, err := dbmodels.AgentsForContents(app, contents)
 			if err != nil {
-				return Error404(e, engine, err)
+				return Error404(e, engine, err, data)
 			}
 			data["crelations"] = crelations
 			for k, v := range cagents {
@@ -90,10 +87,5 @@ func (p *AlmanachPage) Setup(router *router.Router[*core.RequestEvent], app core
 }
 
 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())
+	return engine.Response200(request, TEMPLATE_ALMANACH, data)
 }

pages/person.go

@@ -1,8 +1,6 @@
 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"
@@ -37,13 +35,13 @@ func (p *PersonPage) Setup(router *router.Router[*core.RequestEvent], app core.A
 
 		agent, err := dbmodels.AgentForId(app, person)
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 		data["a"] = agent
 
 		series, relations, entries, err := dbmodels.SeriesForAgent(app, person)
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 
 		dbmodels.SortSeriessesByTitle(series)
@@ -53,19 +51,19 @@ func (p *PersonPage) Setup(router *router.Router[*core.RequestEvent], app core.A
 
 		contents, err := dbmodels.ContentsForAgent(app, person)
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 
 		agents, crelations, err := dbmodels.AgentsForContents(app, contents)
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 		data["agents"] = agents
 		data["crelations"] = crelations
 
 		centries, err := dbmodels.EntriesForContents(app, contents)
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 		data["centries"] = centries
 
@@ -79,13 +77,5 @@ func (p *PersonPage) Setup(router *router.Router[*core.RequestEvent], app core.A
 }
 
 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
+	return engine.Response200(request, TEMPLATE_PERSON, data)
 }

pages/personen.go

@@ -1,9 +1,6 @@
 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"
@@ -90,7 +87,7 @@ func (p *PersonenPage) FilterRequest(app core.App, engine *templating.Engine, e
 	}
 
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	dbmodels.SortAgentsByName(agents)
 	data["agents"] = agents
@@ -106,7 +103,7 @@ func (p *PersonenPage) SearchRequest(app core.App, engine *templating.Engine, e
 
 	agents, altagents, err := dbmodels.BasicSearchAgents(app, search)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 
 	dbmodels.SortAgentsByName(agents)
@@ -129,7 +126,7 @@ func (p *PersonenPage) LetterRequest(app core.App, engine *templating.Engine, e
 
 	agents, err := dbmodels.AgentsForLetter(app, letter)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	dbmodels.SortAgentsByName(agents)
 	data["agents"] = agents
@@ -140,13 +137,8 @@ func (p *PersonenPage) LetterRequest(app core.App, engine *templating.Engine, e
 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)
+		return Error404(request, engine, err, data)
 	}
 
-	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())
+	return engine.Response200(request, URL_PERSONEN, data)
 }

pages/reihe.go

@@ -1,9 +1,6 @@
 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"
@@ -36,13 +33,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 Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 		data["series"] = reihe
 
 		rmap, emap, err := dbmodels.EntriesForSeriesses(app, []*dbmodels.Series{reihe})
 		if err != nil {
-			return Error404(e, engine, err)
+			return Error404(e, engine, err, data)
 		}
 
 		data["relations"] = rmap
@@ -55,10 +52,5 @@ func (p *ReihePage) Setup(router *router.Router[*core.RequestEvent], app core.Ap
 }
 
 func (p *ReihePage) Get(request *core.RequestEvent, engine *templating.Engine, data map[string]interface{}) error {
-	var builder strings.Builder
-	err := engine.Render(&builder, TEMPLATE_REIHE, data)
-	if err != nil {
-		return Error404(request, engine, err)
-	}
-	return request.HTML(http.StatusOK, builder.String())
+	return engine.Response200(request, TEMPLATE_REIHE, data)
 }

pages/reihen.go

@@ -1,9 +1,7 @@
 package pages
 
 import (
-	"net/http"
 	"strconv"
-	"strings"
 
 	"github.com/Theodor-Springmann-Stiftung/musenalm/app"
 	"github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels"
@@ -67,12 +65,12 @@ func (p *ReihenPage) YearRequest(app core.App, engine *templating.Engine, e *cor
 
 	y, err := strconv.Atoi(year)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 
 	series, relations, entries, err := dbmodels.SeriesForYear(app, y)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	data["entries"] = entries
 	data["relations"] = relations
@@ -91,7 +89,7 @@ func (p *ReihenPage) LetterRequest(app core.App, engine *templating.Engine, e *c
 
 	series, err := dbmodels.SeriesForLetter(app, letter)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	// INFO: We sort again since the query can't sort german umlauts correctly
 	dbmodels.SortSeriessesByTitle(series)
@@ -99,7 +97,7 @@ func (p *ReihenPage) LetterRequest(app core.App, engine *templating.Engine, e *c
 
 	rmap, bmap, err := dbmodels.EntriesForSeriesses(app, series)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	data["entries"] = bmap
 	data["relations"] = rmap
@@ -114,13 +112,13 @@ func (p *ReihenPage) PersonRequest(app core.App, engine *templating.Engine, e *c
 
 	agent, err := dbmodels.AgentForId(app, person)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	data["a"] = agent
 
 	series, relations, entries, err := dbmodels.SeriesForAgent(app, person)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	dbmodels.SortSeriessesByTitle(series)
 	data["series"] = series
@@ -137,13 +135,13 @@ func (p *ReihenPage) PlaceRequest(app core.App, engine *templating.Engine, e *co
 
 	pl, err := dbmodels.PlaceForId(app, place)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	data["p"] = pl
 
 	series, relations, entries, err := dbmodels.SeriesForPlace(app, place)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	data["series"] = series
 	data["relations"] = relations
@@ -158,7 +156,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 Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	dbmodels.SortSeriessesByTitle(series)
 	dbmodels.SortSeriessesByTitle(altseries)
@@ -167,7 +165,7 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
 
 	rmap, bmap, err := dbmodels.EntriesForSeriesses(app, series)
 	if err != nil {
-		return Error404(e, engine, err)
+		return Error404(e, engine, err, data)
 	}
 	data["entries"] = bmap
 	data["relations"] = rmap
@@ -207,13 +205,8 @@ 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 Error404(request, engine, err)
+		return Error404(request, engine, err, data)
 	}
 
-	var builder strings.Builder
-	err = engine.Render(&builder, URL_REIHEN, data)
-	if err != nil {
-		return err
-	}
-	return request.HTML(http.StatusOK, builder.String())
+	return engine.Response200(request, URL_REIHEN, data)
 }