Fix word, search pages

main
Elnu 2 years ago
parent 2b85099901
commit d929d50a7c

@ -107,9 +107,11 @@ func ParseEntry(entry *jmdict.JmdictEntry, furiganaInfo *string) Entry {
kanji := "" kanji := ""
if len(entry.Kanji) > 0 { if len(entry.Kanji) > 0 {
kanji = entry.Kanji[0].Expression kanji = entry.Kanji[0].Expression
} else {
kanji = entry.Readings[0].Reading
} }
reading := "" reading := ""
if len(entry.Readings) > 0 { if kanji != "" {
reading = entry.Readings[0].Reading reading = entry.Readings[0].Reading
} }
var definitions []Definition var definitions []Definition
@ -128,7 +130,7 @@ func ParseEntry(entry *jmdict.JmdictEntry, furiganaInfo *string) Entry {
} }
// 1:ねが;3:いた // 1:ねが;3:いた
var furiganaList []Furigana var furiganaList []Furigana
if kanji == "" || *furiganaInfo == "" { if reading == "" || furiganaInfo == nil || *furiganaInfo == "" {
furiganaList = []Furigana{{Kanji: reading, Furigana: ""}} furiganaList = []Furigana{{Kanji: reading, Furigana: ""}}
} else { } else {
furiganaEntries := strings.Split(*furiganaInfo, ";") furiganaEntries := strings.Split(*furiganaInfo, ";")

@ -1,7 +1,6 @@
{{ define "entryfull" }} {{ define "entryfull" }}
<div class="box"> <div class="box">
<h3 lang="ja"> <h3 lang="ja">
<a href="/word/{{ .Kanji }}">
{{- range .Furigana -}} {{- range .Furigana -}}
{{- if .Furigana -}} {{- if .Furigana -}}
<ruby>{{- .Kanji -}}<rp>(</rp><rt>{{- .Furigana -}}</rt><rp>)</rp></ruby> <ruby>{{- .Kanji -}}<rp>(</rp><rt>{{- .Furigana -}}</rt><rp>)</rp></ruby>
@ -9,7 +8,6 @@
{{- .Kanji -}} {{- .Kanji -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
</a>
</h3> </h3>
{{- $count := len .Definitions -}} {{- $count := len .Definitions -}}
{{ if eq $count 1 -}} {{ if eq $count 1 -}}

@ -3,7 +3,7 @@
{{- define "value" }}{{ .Query }}{{- end -}} {{- define "value" }}{{ .Query }}{{- end -}}
{{- define "results" -}} {{- define "results" -}}
{{- template "entryfull" .Entry -}} {{- template "search" . -}}
{{- end -}} {{- end -}}
{{- template "index" . -}} {{- template "index" . -}}