alex/yomichan-import
1
Fork 0
Code Releases Activity

rename Tags to DefinitionTags

Browse Source
This commit is contained in:
siikamiika 2017-10-13 02:46:06 +03:00
parent 3100950efa
commit 26d01e0d56
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common.go
View File

@ -76,48 +76,40 @@ func (freqs dbMetaList) crush() dbRecordList {
type dbTerm struct { type dbTerm struct {
Expression string Expression string
Reading string Reading string
Tags []string DefinitionTags []string
TermTags []string
Rules []string Rules []string
Score int Score int
Glossary []string Glossary []string
Sequence int Sequence int
TermTags []string
} }
type dbTermList []dbTerm type dbTermList []dbTerm
func (term *dbTerm) addTags(tags ...string) { func (term *dbTerm) addDefinitionTags(tags ...string) {
term.Tags = appendStringUnique(term.Tags, tags...) term.DefinitionTags = appendStringUnique(term.DefinitionTags, tags...)
} }
func (term *dbTerm) addTermTags(termTags ...string) { func (term *dbTerm) addTermTags(tags ...string) {
term.TermTags = appendStringUnique(term.TermTags, termTags...) term.TermTags = appendStringUnique(term.TermTags, tags...)
} }
func (term *dbTerm) addRules(rules ...string) { func (term *dbTerm) addRules(rules ...string) {
term.Rules = appendStringUnique(term.Rules, rules...) term.Rules = appendStringUnique(term.Rules, rules...)
} }
func (term *dbTerm) crushTags() string {
tags := strings.Join(term.Tags, " ")
if len(term.TermTags) == 0 {
return tags
} else {
return tags + "\t" + strings.Join(term.TermTags, " ")
}
}
func (terms dbTermList) crush() dbRecordList { func (terms dbTermList) crush() dbRecordList {
var results dbRecordList var results dbRecordList
for _, t := range terms { for _, t := range terms {
result := dbRecord{ result := dbRecord{
t.Expression, t.Expression,
t.Reading, t.Reading,
t.crushTags(), strings.Join(t.DefinitionTags, " "),
strings.Join(t.Rules, " "), strings.Join(t.Rules, " "),
t.Score, t.Score,
t.Glossary, t.Glossary,
t.Sequence, t.Sequence,
strings.Join(t.TermTags, " "),
} }
results = append(results, result) results = append(results, result)

14
edict.go
View File

@ -32,7 +32,7 @@ import (
const jmdictRevision = "jmdict4" const jmdictRevision = "jmdict4"
func jmdictBuildRules(term *dbTerm) { func jmdictBuildRules(term *dbTerm) {
for _, tag := range term.Tags { for _, tag := range term.DefinitionTags {
switch tag { switch tag {
case "adj-i", "v1", "vk": case "adj-i", "v1", "vk":
term.addRules(tag) term.addRules(tag)
@ -47,7 +47,7 @@ func jmdictBuildRules(term *dbTerm) {
} }
func jmdictBuildScore(term *dbTerm) { func jmdictBuildScore(term *dbTerm) {
for _, tag := range term.Tags { for _, tag := range term.DefinitionTags {
switch tag { switch tag {
case "arch": case "arch":
term.Score -= 100 term.Score -= 100
@ -170,12 +170,12 @@ func jmdictExtractTerms(edictEntry jmdict.JmdictEntry, language string) []dbTerm
continue continue
} }
term.addTags(termBase.Tags...) term.addDefinitionTags(termBase.DefinitionTags...)
term.addTermTags(termBase.TermTags...) term.addTermTags(termBase.TermTags...)
term.addTags(partsOfSpeech...) term.addDefinitionTags(partsOfSpeech...)
term.addTags(sense.Fields...) term.addDefinitionTags(sense.Fields...)
term.addTags(sense.Misc...) term.addDefinitionTags(sense.Misc...)
term.addTags(sense.Dialects...) term.addDefinitionTags(sense.Dialects...)
jmdictBuildRules(&term) jmdictBuildRules(&term)
jmdictBuildScore(&term) jmdictBuildScore(&term)