summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/http.go13
-rw-r--r--src/mintage/mintage.go40
-rw-r--r--src/mintage/parser.go368
-rw-r--r--src/mintage/parser_test.go233
-rw-r--r--src/templates.go4
-rw-r--r--src/templates/coins-mintages.html.tmpl15
6 files changed, 166 insertions, 507 deletions
diff --git a/src/http.go b/src/http.go
index 04c17de..eaaeb71 100644
--- a/src/http.go
+++ b/src/http.go
@@ -8,8 +8,6 @@ import (
"log"
"math"
"net/http"
- "os"
- "path/filepath"
"slices"
"strconv"
"strings"
@@ -139,15 +137,8 @@ func mintageHandler(next http.Handler) http.Handler {
td.Type = "circ"
}
- path := filepath.Join("data", "mintages", td.Code)
- f, err := os.Open(path)
- if err != nil {
- throwError(http.StatusInternalServerError, err, w, r)
- return
- }
- defer f.Close()
-
- td.Mintages, err = mintage.Parse(f, path)
+ var err error
+ td.Mintages, err = mintage.Parse(td.Code)
if err != nil {
throwError(http.StatusInternalServerError, err, w, r)
return
diff --git a/src/mintage/mintage.go b/src/mintage/mintage.go
new file mode 100644
index 0000000..cc94de7
--- /dev/null
+++ b/src/mintage/mintage.go
@@ -0,0 +1,40 @@
+package mintage
+
+type Data struct {
+ Standard []SRow
+ Commemorative []CRow
+}
+
+type SRow struct {
+ Year int
+ Mintmark string
+ Mintages [denoms]int
+}
+
+type CRow struct {
+ Year int
+ Name string
+ Mintmark string
+ Mintage int
+}
+
+const (
+ TypeCirc = iota
+ TypeNifc
+ TypeProof
+)
+
+const (
+ Unknown = -iota - 1
+ Invalid
+)
+
+const denoms = 8
+
+var cache map[string][3]Data = make(map[string][3]Data)
+
+func ClearCache(country string) {
+ if _, ok := cache[country]; ok {
+ delete(cache, country)
+ }
+}
diff --git a/src/mintage/parser.go b/src/mintage/parser.go
index 364b6e8..daeb05d 100644
--- a/src/mintage/parser.go
+++ b/src/mintage/parser.go
@@ -1,297 +1,153 @@
package mintage
import (
- "bufio"
- "fmt"
+ "encoding/csv"
"io"
+ "os"
+ "path/filepath"
"strconv"
- "strings"
- "time"
)
-type SyntaxError struct {
- expected, got string
- file string
- linenr int
-}
-
-func (e SyntaxError) Error() string {
- return fmt.Sprintf("%s:%d: syntax error: expected %s but got %s",
- e.file, e.linenr, e.expected, e.got)
-}
-
-type Data struct {
- Standard []SRow
- Commemorative []CRow
-}
+func Parse(country string) ([3]Data, error) {
+ if data, ok := cache[country]; ok {
+ return data, nil
+ }
-type SRow struct {
- Year int
- Mintmark string
- Mintages [typeCount][denoms]int
-}
+ var (
+ data [3]Data
+ err error
+ path = filepath.Join("data", "mintages", country)
+ )
-type CRow struct {
- Year int
- Mintmark string
- Name string
- Mintage [typeCount]int
+ data[TypeCirc].Standard, err = parseS(path + "-s-circ.csv")
+ if err != nil {
+ return data, err
+ }
+ data[TypeNifc].Standard, err = parseS(path + "-s-nifc.csv")
+ if err != nil {
+ return data, err
+ }
+ data[TypeProof].Standard, err = parseS(path + "-s-proof.csv")
+ if err != nil {
+ return data, err
+ }
+ data[TypeCirc].Commemorative, err = parseC(path + "-c-circ.csv")
+ if err != nil {
+ return data, err
+ }
+ data[TypeNifc].Commemorative, err = parseC(path + "-c-nifc.csv")
+ if err != nil {
+ return data, err
+ }
+ data[TypeProof].Commemorative, err = parseC(path + "-c-proof.csv")
+ if err == nil {
+ cache[country] = data
+ }
+ return data, err
}
-const (
- TypeCirc = iota
- TypeNIFC
- TypeProof
- typeCount
-)
+func parseS(path string) ([]SRow, error) {
+ rows := make([]SRow, 0, 69) /* TODO: Compute number of rows */
-const (
- Unknown = -iota - 1
- Invalid
-)
+ f, err := os.Open(path)
+ if err != nil {
+ return nil, err
+ }
+ defer f.Close()
-const (
- denoms = 8
- ws = " \t"
-)
+ r := csv.NewReader(f)
+ r.Comment = '#'
+ r.FieldsPerRecord = 10
+ r.ReuseRecord = true
-func Parse(r io.Reader, file string) (Data, error) {
- yearsSince := time.Now().Year() - 1999 + 1
- data := Data{
- Standard: make([]SRow, 0, yearsSince),
- Commemorative: make([]CRow, 0, yearsSince),
+ /* Skip header */
+ if _, err := r.Read(); err != nil {
+ return nil, err
}
- scanner := bufio.NewScanner(r)
- for linenr := 1; scanner.Scan(); linenr++ {
- line := strings.Trim(scanner.Text(), ws)
- if isBlankOrComment(line) {
- continue
+ for {
+ record, err := r.Read()
+ if err == io.EOF {
+ break
}
-
- if len(line) < 4 || !isNumeric(line[:4], false) {
- return Data{}, SyntaxError{
- expected: "4-digit year",
- got: line,
- linenr: linenr,
- file: file,
- }
+ if err != nil {
+ return nil, err
}
- var (
- commem bool
- mintmark string
- )
- year, _ := strconv.Atoi(line[:4])
- line = line[4:]
-
- if len(line) != 0 {
- if strings.ContainsRune(ws, rune(line[0])) {
- commem = true
- goto out
- }
- if line[0] != '-' {
- return Data{}, SyntaxError{
- expected: "end-of-line or mintmark",
- got: line,
- linenr: linenr,
- file: file,
- }
- }
+ data := SRow{Mintmark: record[1]}
- if line = line[1:]; len(line) == 0 {
- return Data{}, SyntaxError{
- expected: "mintmark",
- got: "end-of-line",
- linenr: linenr,
- file: file,
- }
- }
+ data.Year, err = strconv.Atoi(record[0])
+ if err != nil {
+ return nil, err
+ }
- switch i := strings.IndexAny(line, ws); i {
- case 0:
- return Data{}, SyntaxError{
- expected: "mintmark",
- got: "whitespace",
- linenr: linenr,
- file: file,
+ for i, s := range record[2:] {
+ if s == "" {
+ data.Mintages[i] = Unknown
+ } else {
+ data.Mintages[i], err = strconv.Atoi(s)
+ if err != nil {
+ data.Mintages[i] = Invalid
}
- case -1:
- mintmark = line
- default:
- mintmark, line = line[:i], line[i:]
- commem = true
}
}
- out:
-
- if !commem {
- row := SRow{
- Year: year,
- Mintmark: mintmark,
- }
- for i := range row.Mintages {
- line = ""
- for isBlankOrComment(line) {
- if !scanner.Scan() {
- return Data{}, SyntaxError{
- expected: "mintage row",
- got: "end-of-file",
- linenr: linenr,
- file: file,
- }
- }
- line = strings.Trim(scanner.Text(), ws)
- linenr++
- }
-
- tokens := strings.FieldsFunc(line, func(r rune) bool {
- return strings.ContainsRune(ws, r)
- })
- if tokcnt := len(tokens); tokcnt != denoms {
- word := "entries"
- if tokcnt == 1 {
- word = "entry"
- }
- return Data{}, SyntaxError{
- expected: fmt.Sprintf("%d mintage entries", denoms),
- got: fmt.Sprintf("%d %s", tokcnt, word),
- linenr: linenr,
- file: file,
- }
- }
-
- for j, tok := range tokens {
- if tok != "?" && !isNumeric(tok, true) {
- return Data{}, SyntaxError{
- expected: "numeric mintage figure or ‘?’",
- got: tok,
- linenr: linenr,
- file: file,
- }
- }
- if tok == "?" {
- row.Mintages[i][j] = Unknown
- } else {
- row.Mintages[i][j] = atoiWithDots(tok)
- }
- }
- }
+ rows = append(rows, data)
+ }
- data.Standard = append(data.Standard, row)
- } else {
- row := CRow{
- Year: year,
- Mintmark: mintmark,
- }
- line = strings.TrimLeft(line, ws)
- if line[0] != '"' {
- return Data{}, SyntaxError{
- expected: "string",
- got: line,
- linenr: linenr,
- file: file,
- }
- }
+ return rows, nil
+}
- line = line[1:]
- switch i := strings.IndexByte(line, '"'); i {
- case -1:
- return Data{}, SyntaxError{
- expected: "closing quote",
- got: "end-of-line",
- linenr: linenr,
- file: file,
- }
- case 0:
- return Data{}, SyntaxError{
- expected: "commemorated event",
- got: "empty string",
- linenr: linenr,
- file: file,
- }
- default:
- row.Name, line = line[:i], line[i+1:]
- }
+func parseC(path string) ([]CRow, error) {
+ rows := make([]CRow, 0, 69) /* TODO: Compute number of rows */
- if len(line) != 0 {
- return Data{}, SyntaxError{
- expected: "end-of-line",
- got: line,
- linenr: linenr,
- file: file,
- }
- }
+ f, err := os.Open(path)
+ if err != nil {
+ return nil, err
+ }
+ defer f.Close()
- for isBlankOrComment(line) {
- if !scanner.Scan() {
- return Data{}, SyntaxError{
- expected: "mintage row",
- got: "end-of-file",
- linenr: linenr,
- file: file,
- }
- }
- line = strings.Trim(scanner.Text(), ws)
- linenr++
- }
+ r := csv.NewReader(f)
+ r.Comment = '#'
+ r.FieldsPerRecord = 4
+ r.ReuseRecord = true
- tokens := strings.FieldsFunc(line, func(r rune) bool {
- return strings.ContainsRune(ws, r)
- })
- if tokcnt := len(tokens); tokcnt != typeCount {
- word := "entries"
- if tokcnt == 1 {
- word = "entry"
- }
- return Data{}, SyntaxError{
- expected: fmt.Sprintf("%d mintage entries", typeCount),
- got: fmt.Sprintf("%d %s", tokcnt, word),
- linenr: linenr,
- file: file,
- }
- }
+ /* Skip header */
+ if _, err := r.Read(); err != nil {
+ return nil, err
+ }
- for i, tok := range tokens {
- if tok == "?" {
- row.Mintage[i] = Unknown
- } else {
- row.Mintage[i] = atoiWithDots(tok)
- }
- }
+ for {
+ record, err := r.Read()
+ if err == io.EOF {
+ break
+ }
+ if err != nil {
+ return nil, err
+ }
- data.Commemorative = append(data.Commemorative, row)
+ data := CRow{
+ Name: record[1],
+ Mintmark: record[2],
}
- }
- return data, nil
-}
+ data.Year, err = strconv.Atoi(record[0])
+ if err != nil {
+ return nil, err
+ }
-func isNumeric(s string, dot bool) bool {
- for _, ch := range s {
- switch ch {
- case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
- default:
- if ch != '.' || !dot {
- return false
+ s := record[3]
+ if s == "" {
+ data.Mintage = Unknown
+ } else {
+ data.Mintage, err = strconv.Atoi(s)
+ if err != nil {
+ data.Mintage = Invalid
}
}
- }
- return true
-}
-func atoiWithDots(s string) int {
- n := 0
- for _, ch := range s {
- if ch == '.' {
- continue
- }
- n = n*10 + int(ch) - '0'
+ rows = append(rows, data)
}
- return n
-}
-func isBlankOrComment(s string) bool {
- return len(s) == 0 || s[0] == '#'
+ return rows, nil
}
diff --git a/src/mintage/parser_test.go b/src/mintage/parser_test.go
deleted file mode 100644
index 76e0f01..0000000
--- a/src/mintage/parser_test.go
+++ /dev/null
@@ -1,233 +0,0 @@
-package mintage
-
-import (
- "bytes"
- "errors"
- "testing"
-)
-
-func TestParserComplete(t *testing.T) {
- data, err := Parse(bytes.NewBuffer([]byte(`
- 2020
- 1000 1001 1002 1003 1004 1005 1006 1007
- 1100 1101 1102 1103 1104 1105 1106 1107
- 1200 1201 1202 1203 1204 1205 1206 1207
- 2021-KNM
- 2.000 ? 2002 2003 2004 2005 2006 2007
- 2.100 ? 2102 2103 2104 2105 2106 2107
- 2.200 ? 2202 2203 2204 2205 2206 2207
- 2021-MdP
- 3000 3001 3002 3003 3004 3005 3006 3007
- 3100 3101 3102 3103 3104 3105 3106 3107
- 3200 3201 3202 3203 3204 3205 3206 3207
- 2022
- 4000 4001 4.002 4003 4004 4005 4006 4007
- 4100 4101 4.102 4103 4104 4105 4106 4107
- 4200 4201 4.202 4203 4204 4205 4206 4207
-
- 2009 "10th Anniversary of Economic and Monetary Union"
- 1000 2000 3000
- 2022-⋆ "35th Anniversary of the Erasmus Programme"
- 1001 ? 3001
- `)), "-")
-
- if err != nil {
- t.Fatalf(`Expected err=nil; got "%s"`, err)
- }
-
- for i, row := range data.Standard {
- for k := TypeCirc; k <= TypeProof; k++ {
- for j, col := range row.Mintages[k] {
- n := 1000*(i+1) + 100*k + j
- if i == 1 && j == 1 {
- n = Unknown
- }
- if col != n {
- t.Fatalf("Expected data.Standard[%d].Mintages[%d][%d]=%d; got %d",
- i, k, j, col, n)
- }
- }
- }
- }
-
- for i, row := range data.Commemorative {
- for k := TypeCirc; k <= TypeProof; k++ {
- n := 1000*(k+1) + i
- if i == 1 && k == 1 {
- n = Unknown
- }
- if row.Mintage[k] != n {
- t.Fatalf("Expected row.Mintage[%d]=%d; got %d",
- k, n, row.Mintage[k])
- }
- }
- }
-
- if len(data.Standard) != 4 {
- t.Fatalf("Expected len(data.Standard)=2; got %d", len(data.Standard))
- }
- if len(data.Commemorative) != 2 {
- t.Fatalf("Expected len(data.Commemorative)=2; got %d", len(data.Commemorative))
- }
-
- for i, x := range [...]struct {
- year int
- mintmark, name string
- }{
- {2009, "", "10th Anniversary of Economic and Monetary Union"},
- {2022, "⋆", "35th Anniversary of the Erasmus Programme"},
- } {
- if data.Commemorative[i].Year != x.year {
- t.Fatalf("Expected data.Commemorative[%d].Year=%d; got %d",
- i, x.year, data.Commemorative[i].Year)
- }
- if data.Commemorative[i].Mintmark != x.mintmark {
- t.Fatalf(`Expected data.Commemorative[%d].Mintmark="%s"; got "%s"`,
- i, x.mintmark, data.Commemorative[i].Mintmark)
- }
- if data.Commemorative[i].Name != x.name {
- t.Fatalf(`Expected data.Commemorative[%d].Name="%s"; got "%s"`,
- i, x.name, data.Commemorative[i].Name)
- }
- }
-}
-
-func TestParserMintmarks(t *testing.T) {
- data, err := Parse(bytes.NewBuffer([]byte(`
- 2020
- 1000 1001 1002 1003 1004 1005 1006 1007
- 1100 1101 1102 1103 1104 1105 1106 1107
- 1200 1201 1202 1203 1204 1205 1206 1207
- 2021-KNM
- 2.000 ? 2002 2003 2004 2005 2006 2007
- 2.100 ? 2102 2103 2104 2105 2106 2107
- 2.200 ? 2202 2203 2204 2205 2206 2207
- 2021-MdP
- 3000 3001 3002 3003 3004 3005 3006 3007
- 3100 3101 3102 3103 3104 3105 3106 3107
- 3200 3201 3202 3203 3204 3205 3206 3207
- 2022
- 4000 4001 4.002 4003 4004 4005 4006 4007
- 4100 4101 4.102 4103 4104 4105 4106 4107
- 4200 4201 4.202 4203 4204 4205 4206 4207
- `)), "-")
-
- if err != nil {
- t.Fatalf(`Expected err=nil; got "%s"`, err)
- }
-
- for i, row := range data.Standard {
- for j, col := range row.Mintages[TypeCirc] {
- n := 1000*(i+1) + j
- if i == 1 && j == 1 {
- n = Unknown
- }
- if col != n {
- t.Fatalf("Expected data.Standard[%d].Mintages[TypeCirc][%d]=%d; got %d",
- i, j, col, n)
- }
- }
- }
-
- for i, y := range [...]int{2020, 2021, 2021, 2022} {
- if data.Standard[i].Year != y {
- t.Fatalf("Expected data.Standard[%d].Year=%d; got %d",
- i, y, data.Standard[i].Year)
- }
- }
-
- for i, m := range [...]string{"", "KNM", "MdP", ""} {
- if data.Standard[i].Mintmark != m {
- t.Fatalf(`Expected data.Standard[%d].Mintmark="%s"; got "%s"`,
- i, m, data.Standard[i].Mintmark)
- }
- }
-}
-
-func TestParserNoYear(t *testing.T) {
- _, err := Parse(bytes.NewBuffer([]byte(`
- 1.000 1001 1002 1003 1004 1005 1006 1007
- 1.100 1101 1102 1103 1104 1105 1106 1107
- 1.200 1201 1202 1203 1204 1205 1206 1207
- 2021
- 2000 ? 2002 2003 2004 2005 2006 2007
- 2100 ? 2102 2103 2104 2105 2106 2107
- 2200 ? 2202 2203 2204 2205 2206 2207
- `)), "-")
-
- var sErr SyntaxError
- if !errors.As(err, &sErr) {
- t.Fatalf("Expected err=SyntaxError; got %s", err)
- }
-}
-
-func TestParserBadToken(t *testing.T) {
- _, err := Parse(bytes.NewBuffer([]byte(`
- 2020
- 1.000 1001 1002 1003 1004 1005 1006 1007
- 1.100 1101 1102 1103 1104 1105 1106 1107
- 1.200 1201 1202 1203 1204 1205 1206 1207
- 2021 Naughty!
- 2000 ? 2002 2003 2004 2005 2006 2007
- 2100 ? 2102 2103 2104 2105 2106 2107
- 2200 ? 2202 2203 2204 2205 2206 2207
- `)), "-")
-
- var sErr SyntaxError
- if !errors.As(err, &sErr) {
- t.Fatalf("Expected err=SyntaxError; got %s", err)
- }
-}
-
-func TestParserShortRow(t *testing.T) {
- _, err := Parse(bytes.NewBuffer([]byte(`
- 2020
- 1.000 1001 1002 1003 1004 1005 1006 1007
- 1.100 1101 1102 1103 1104 1105 1106 1107
- 1.200 1201 1202 1203 1204 1205 1206 1207
- 2021
- 2000 ? 2002 2003 2004 2005 2006 2007
- 2100 ? 2102 2103 2104 2105 2106
- 2200 ? 2202 2203 2204 2205 2206 2207
- `)), "-")
-
- var sErr SyntaxError
- if !errors.As(err, &sErr) {
- t.Fatalf("Expected err=SyntaxError; got %s", err)
- }
-}
-
-func TestParserLongRow(t *testing.T) {
- _, err := Parse(bytes.NewBuffer([]byte(`
- 2020
- 1.000 1001 1002 1003 1004 1005 1006 1007
- 1.100 1101 1102 1103 1104 1105 1106 1107
- 1.200 1201 1202 1203 1204 1205 1206 1207
- 2021
- 2000 ? 2002 2003 2004 2005 2006 2007
- 2100 ? 2102 2103 2104 2105 2106 2107 2108
- 2200 ? 2202 2203 2204 2205 2206 2207
- `)), "-")
-
- var sErr SyntaxError
- if !errors.As(err, &sErr) {
- t.Fatalf("Expected err=SyntaxError; got %s", err)
- }
-}
-
-func TestParserMissingRow(t *testing.T) {
- _, err := Parse(bytes.NewBuffer([]byte(`
- 2020
- 1.000 1001 1002 1003 1004 1005 1006 1007
- 1.100 1101 1102 1103 1104 1105 1106 1107
- 1.200 1201 1202 1203 1204 1205 1206 1207
- 2021
- 2000 ? 2002 2003 2004 2005 2006 2007
- 2200 ? 2202 2203 2204 2205 2206 2207
- `)), "-")
-
- var sErr SyntaxError
- if !errors.As(err, &sErr) {
- t.Fatalf("Expected err=SyntaxError; got %s", err)
- }
-}
diff --git a/src/templates.go b/src/templates.go
index 2cee22e..f6413d9 100644
--- a/src/templates.go
+++ b/src/templates.go
@@ -13,7 +13,7 @@ import (
type templateData struct {
Printer Printer
Code, Type string
- Mintages mintage.Data
+ Mintages [3]mintage.Data
Countries []country
}
@@ -86,7 +86,7 @@ func templateMakeTuple(args ...any) []any {
func strToCtype(s string) int {
switch s {
case "nifc":
- return mintage.TypeNIFC
+ return mintage.TypeNifc
case "proof":
return mintage.TypeProof
default:
diff --git a/src/templates/coins-mintages.html.tmpl b/src/templates/coins-mintages.html.tmpl
index 8c60248..8554c3f 100644
--- a/src/templates/coins-mintages.html.tmpl
+++ b/src/templates/coins-mintages.html.tmpl
@@ -66,6 +66,7 @@
</div>
<button type="submit">{{ .T "Filter" }}</button>
</form>
+ {{ $data := (index .Mintages (strToCtype .Type)) }}
<figure>
<figcaption>{{ .T "Standard Issue Coins" }}</figcaption>
<table class="mintage-table" role="grid">
@@ -80,7 +81,7 @@
<tbody>
{{ $p := .Printer }}
{{ $type := .Type }}
- {{ range .Mintages.Standard }}
+ {{ range $data.Standard }}
<tr>
<th scope="col">
{{- .Year -}}
@@ -88,9 +89,11 @@
&nbsp;<sub><small>{{ .Mintmark }}</small></sub>
{{- end -}}
</th>
- {{ range (index .Mintages (strToCtype $type)) }}
+ {{ range .Mintages }}
{{ if eq . -1 }}
<td>{{ $p.T "Unknown" }}</td>
+ {{ else if eq . -2 }}
+ <td class="error">{{ $p.T "Error" }}</td>
{{ else if eq . 0 }}
<td>—</td>
{{ else }}
@@ -103,7 +106,7 @@
</tbody>
</table>
</figure>
- {{ if ne (len .Mintages.Commemorative) 0 }}
+ {{ if ne (len $data.Commemorative) 0 }}
<figure>
<figcaption>{{ .T "Commemorative Coins" }}</figcaption>
<table class="mintage-table-cc" role="grid">
@@ -115,7 +118,7 @@
<tbody>
{{ $p := .Printer }}
{{ $type := .Type }}
- {{ range .Mintages.Commemorative }}
+ {{ range $data.Commemorative }}
<tr>
<th scope="col">
{{- .Year -}}
@@ -125,9 +128,11 @@
</th>
<!-- TODO: Translate commemorative names -->
<td>{{ .Name }}</td>
- {{ with (index .Mintage (strToCtype $type)) }}
+ {{ with .Mintage }}
{{ if eq . -1 }}
<td>{{ $p.T "Unknown" }}</td>
+ {{ else if eq . -2 }}
+ <td class="error">{{ $p.T "Error" }}</td>
{{ else if eq . 0 }}
<td>—</td>
{{ else }}