From 1ee4aae58058f76d129b9dcf9a359fadfeccf0e6 Mon Sep 17 00:00:00 2001 From: siikamiika Date: Thu, 12 Oct 2017 07:01:36 +0300 Subject: [PATCH] edict: fix PartsOfSpeech and Misc with Restricted* --- edict.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/edict.go b/edict.go index 6937bd4..359e2c8 100644 --- a/edict.go +++ b/edict.go @@ -141,6 +141,15 @@ func jmdictExtractTerms(edictEntry jmdict.JmdictEntry, language string) []dbTerm var partsOfSpeech []string var misc []string for index, sense := range edictEntry.Sense { + + if len(sense.PartsOfSpeech) != 0 { + partsOfSpeech = sense.PartsOfSpeech + } + + if len(sense.Misc) != 0 { + misc = sense.Misc + } + if sense.RestrictedReadings != nil && !hasString(reading.Reading, sense.RestrictedReadings) { continue } @@ -166,14 +175,6 @@ func jmdictExtractTerms(edictEntry jmdict.JmdictEntry, language string) []dbTerm continue } - if len(sense.PartsOfSpeech) != 0 { - partsOfSpeech = sense.PartsOfSpeech - } - - if len(sense.Misc) != 0 { - misc = sense.Misc - } - term.addTags(termBase.Tags...) term.addTermTags(termBase.TermTags...) term.addTags(partsOfSpeech...)