|
@@ -117,10 +117,18 @@ func ScoreFields(j *ju.Job) map[string][]*ju.ExtField {
|
|
|
} else if strings.Contains(tmpsvalue.Type, "table") {
|
|
|
tmps[tmpsindex].Score += qu.Float64All(SoreConfig["extractype"]["table"])
|
|
|
tmps[tmpsindex].ScoreItem = append(tmps[tmpsindex].ScoreItem, &ju.ScoreItem{Des: "tablekv", Code: tmpsvalue.Code, RuleText: tmpsvalue.RuleText, Type: tmpsvalue.Type, MatchType: tmpsvalue.MatchType, ExtFrom: tmpsvalue.ExtFrom, Value: tmpsvalue.Value, Score: qu.Float64All(SoreConfig["extractype"]["table"])})
|
|
|
- } else if strings.Contains(tmpsvalue.Type, "regexp") {
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if tmpsvalue.ExtFrom != "title" { //非标题抽取
|
|
|
+ if strings.Contains(tmpsvalue.Type, "regexp") {
|
|
|
tmps[tmpsindex].Score += qu.Float64All(SoreConfig["extractype"]["regexp"])
|
|
|
tmps[tmpsindex].ScoreItem = append(tmps[tmpsindex].ScoreItem, &ju.ScoreItem{Des: "regexp", Code: tmpsvalue.Code, RuleText: tmpsvalue.RuleText, Type: tmpsvalue.Type, MatchType: tmpsvalue.MatchType, ExtFrom: tmpsvalue.ExtFrom, Value: tmpsvalue.Value, Score: qu.Float64All(SoreConfig["extractype"]["regexp"])})
|
|
|
}
|
|
|
+ } else {
|
|
|
+ if strings.Contains(tmpsvalue.Type, "regexp") {
|
|
|
+ tmps[tmpsindex].Score += qu.Float64All(SoreConfig["extractype"]["regexp"])
|
|
|
+ tmps[tmpsindex].ScoreItem = append(tmps[tmpsindex].ScoreItem, &ju.ScoreItem{Des: "regexp", Code: tmpsvalue.Code, RuleText: tmpsvalue.RuleText, Type: tmpsvalue.Type, MatchType: tmpsvalue.MatchType, ExtFrom: tmpsvalue.ExtFrom, Value: tmpsvalue.Value, Score: qu.Float64All(SoreConfig["extractype"]["regexp"]) + 1})
|
|
|
+ }
|
|
|
}
|
|
|
scoreRule := SoreConfig[field]
|
|
|
if scoreRule == nil {
|