some bug fixes

providers/xmlprovider/issues.go

@@ -35,34 +35,23 @@ func (i Issue) Keys() []string {
 	}
 
 	res := make([]string, 2)
-	date := i.Datum.When
+	date := i.Datum.When.String()
 	if date != "" {
 		res = append(res, date)
 	}
 
-	if ref, err := i.Reference(); err == nil {
+	res = append(res, i.Reference())
-		res = append(res, ref)
-	}
-
 	i.keys = res
 
 	return res
 }
 
-// TODO: We could even cache this
+func (i Issue) Year() int {
-func (i Issue) Year() (int, error) {
+	return i.Datum.When.Year
-	if date := i.Datum.Date(); date != nil {
-		return date.Year(), nil
-	}
-	return 0, InvalidDateError
 }
 
-func (i Issue) Reference() (string, error) {
+func (i Issue) Reference() string {
-	if date := i.Datum.Date(); date != nil {
+	return strconv.Itoa(i.Number.No) + "-" + i.Datum.When.String()
-		return strconv.Itoa(date.Year()) + "-" + strconv.Itoa(i.Number.No), nil
-	}
-
-	return "", InvalidDateError
 }
 
 func (i Issue) String() string {

providers/xmlprovider/pieces.go

@@ -41,21 +41,17 @@ func (p Piece) Keys() []string {
 	uid := uuid.New()
 
 	for _, i := range p.IssueRefs {
-		if d := i.Date(); d != nil {
+		ret = append(ret, strconv.Itoa(i.When.Year)+"-"+strconv.Itoa(i.Nr)+"-"+uid.String())
-			ret = append(ret, strconv.Itoa(d.Year())+"-"+strconv.Itoa(i.Nr)+"-"+uid.String())
-		}
 	}
 
 	p.keys = ret
-
 	return ret
 }
 
 func (p Piece) ReferencesIssue(y, no int) (*IssueRef, bool) {
 	for _, i := range p.IssueRefs {
 		if i.Nr == no {
-			d := i.Date()
+			if i.When.Year == y {
-			if d != nil && d.Year() == y {
 				return &i, true
 			}
 		}

viewmodels/issue_view.go

@@ -53,19 +53,13 @@ func NewSingleIssueView(y string, no string, lib *xmlprovider.Library) (*IssueVM
 }
 
 func PiecesForIsssue(lib *xmlprovider.Library, issue xmlprovider.Issue) (*PiecesByPage, *PiecesByPage, error) {
-	date := issue.Datum.Date()
+	year := issue.Datum.When.Year
-	if date == nil {
-		return nil, nil, fmt.Errorf("Issue has no date")
-	}
-
-	year := date.Year()
 
 	ppi := PiecesByPage{Items: make(map[int][]PieceListitemVM)}
 	ppa := PiecesByPage{Items: make(map[int][]PieceListitemVM)}
 
 	slog.Debug(fmt.Sprintf("Checking piece for year %v, number %v", year, issue.Number.No))
 	for _, piece := range lib.Pieces.Array {
-
 		if d, ok := piece.ReferencesIssue(year, issue.Number.No); ok {
 			slog.Debug(fmt.Sprintf("Found piece %v in issue %v-%v", piece, year, issue.Number.No))
 			p := PieceListitemVM{Piece: piece, Reference: *d}

viewmodels/issuelistitem_view.go

@@ -1,8 +1,6 @@
 package viewmodels
 
 import (
-	"time"
-
 	"github.com/Theodor-Springmann-Stiftung/kgpz_web/providers/xmlprovider"
 )
 
@@ -17,16 +15,11 @@ type IssueListitemVM struct {
 }
 
 func ListitemFromIssue(i xmlprovider.Issue) (*IssueListitemVM, error) {
-	t, err := time.Parse(TLAYOUT, i.Datum.When)
-	if err != nil {
-		return nil, err
-	}
-
 	return &IssueListitemVM{
 		No:    i.Number.No,
 		Issue: i,
-		Day:   t.Day(),
+		Day:   i.Datum.When.Day,
-		Month: int(t.Month()),
+		Month: i.Datum.When.Month,
-		Year:  t.Year(),
+		Year:  i.Datum.When.Year,
 	}, nil
 }

viewmodels/year_view.go

@@ -31,12 +31,11 @@ func YearView(year int, lib *xmlprovider.Library) (*YearVM, error) {
 
 	lib.Issues.Lock()
 	for _, issue := range lib.Issues.Array {
-		if y, err := issue.Year(); err == nil {
+		y := issue.Datum.When.Year
-			years[y] = true
+		years[y] = true
-			if y == year {
+		if y == year {
-				if issuevm, err := ListitemFromIssue(issue); err == nil {
+			if issuevm, err := ListitemFromIssue(issue); err == nil {
-					issues[issuevm.Month] = append(issues[issuevm.Month], *issuevm)
+				issues[issuevm.Month] = append(issues[issuevm.Month], *issuevm)
-				}
 			}
 		}
 	}