|
@@ -345,6 +345,9 @@ func (e *ExtractTask) ExtractDetail(j *ju.Job) {
|
|
|
//抽取规则
|
|
|
tmprules := map[string][]*RuleCore{}
|
|
|
lock.Lock()
|
|
|
+ if j.Category == "*"{
|
|
|
+ j.Category = "*_其他"
|
|
|
+ }
|
|
|
for k, vc1 := range e.RuleCores[j.Category] {
|
|
|
tmprules[k] = vc1
|
|
|
}
|
|
@@ -672,11 +675,17 @@ func ExtRegCore(extfrom string, doc map[string]interface{}, j *ju.Job, in *RegLu
|
|
|
}
|
|
|
if tmps, ok := v.([]map[string]interface{}); ok {
|
|
|
for _, tmp := range tmps {
|
|
|
- field := &ju.ExtField{Field: k, Code: qu.ObjToString(tmp["code"]), RuleText: qu.ObjToString(tmp["ruletext"]), Type: qu.ObjToString(tmp["type"]), MatchType: qu.ObjToString(tmp["matchtype"]), ExtFrom: extfrom, Value: tmp["value"], Score: 0}
|
|
|
+ field := &ju.ExtField{Field: k, Code: qu.ObjToString(tmp["code"]), RuleText: qu.ObjToString(tmp["ruletext"]), Type: qu.ObjToString(tmp["type"]), MatchType: qu.ObjToString(tmp["matchtype"]), ExtFrom: extfrom, Value: tmp["value"], }
|
|
|
+ if extfrom == "title"{
|
|
|
+ field.Score = 4
|
|
|
+ }
|
|
|
if tmp["blocktag"] != nil {
|
|
|
field.BlockTag = tmp["blocktag"].(map[string]bool)
|
|
|
}
|
|
|
- item := &ju.ScoreItem{Des: "初始化", Code: qu.ObjToString(tmp["code"]), RuleText: qu.ObjToString(tmp["ruletext"]), Type: qu.ObjToString(tmp["type"]), MatchType: qu.ObjToString(tmp["matchtype"]), ExtFrom: extfrom, Value: tmp["value"], Score: 0}
|
|
|
+ item := &ju.ScoreItem{Des: "初始化", Code: qu.ObjToString(tmp["code"]), RuleText: qu.ObjToString(tmp["ruletext"]), Type: qu.ObjToString(tmp["type"]), MatchType: qu.ObjToString(tmp["matchtype"]), ExtFrom: extfrom, Value: tmp["value"]}
|
|
|
+ if extfrom =="title"{
|
|
|
+ item.Score = 4
|
|
|
+ }
|
|
|
if tmp["scoreitem"] == nil {
|
|
|
scoreItems := make([]*ju.ScoreItem, 0)
|
|
|
scoreItems = append(scoreItems, item)
|
|
@@ -921,11 +930,17 @@ func extRegCoreToResult(extfrom, text string, tag *map[string]bool, j *ju.Job, v
|
|
|
tmps = append(tmps, tmp)
|
|
|
extinfo[k] = tmps
|
|
|
if strings.TrimSpace(val) != "" {
|
|
|
- exfield := ju.ExtField{Field: k, Code: v.Code, RuleText: v.RuleText, Type: "regexp", MatchType: "regcontent", ExtFrom: extfrom, Value: val, Score: 0}
|
|
|
+ exfield := ju.ExtField{Field: k, Code: v.Code, RuleText: v.RuleText, Type: "regexp", MatchType: "regcontent", ExtFrom: extfrom, Value: val}
|
|
|
+ if extfrom == "title"{
|
|
|
+ exfield.Score = 4
|
|
|
+ }
|
|
|
if tmp["blocktag"] != nil {
|
|
|
exfield.BlockTag = tmp["blocktag"].(map[string]bool)
|
|
|
}
|
|
|
- item := ju.ScoreItem{Des: "初始化", Code: v.Code, RuleText: v.RuleText, Type: "regexp", MatchType: "regcontent", ExtFrom: extfrom, Value: val, Score: 0}
|
|
|
+ item := ju.ScoreItem{Des: "初始化", Code: v.Code, RuleText: v.RuleText, Type: "regexp", MatchType: "regcontent", ExtFrom: extfrom, Value: val}
|
|
|
+ if extfrom =="title"{
|
|
|
+ item.Score = 4
|
|
|
+ }
|
|
|
if tmp["scoreitem"] == nil {
|
|
|
sitems := make([]*ju.ScoreItem, 0)
|
|
|
sitems = append(sitems, &item)
|
|
@@ -967,11 +982,17 @@ func extRegCoreToResult(extfrom, text string, tag *map[string]bool, j *ju.Job, v
|
|
|
if j.Result[v.Field] == nil {
|
|
|
j.Result[v.Field] = [](*ju.ExtField){}
|
|
|
}
|
|
|
- field := &ju.ExtField{Field: v.Field, Code: v.Code, RuleText: v.RuleText, Type: "regexp", MatchType: "regcontent", ExtFrom: extfrom, Value: val, Score: 0}
|
|
|
+ field := &ju.ExtField{Field: v.Field, Code: v.Code, RuleText: v.RuleText, Type: "regexp", MatchType: "regcontent", ExtFrom: extfrom, Value: val}
|
|
|
+ if extfrom == "title"{
|
|
|
+ field.Score = 4
|
|
|
+ }
|
|
|
if tmp["blocktag"] != nil {
|
|
|
field.BlockTag = tmp["blocktag"].(map[string]bool)
|
|
|
}
|
|
|
- item := ju.ScoreItem{Des: "初始化", Code: v.Code, RuleText: v.RuleText, Type: "regexp", MatchType: "regcontent", ExtFrom: extfrom, Value: val, Score: 0}
|
|
|
+ item := ju.ScoreItem{Des: "初始化", Code: v.Code, RuleText: v.RuleText, Type: "regexp", MatchType: "regcontent", ExtFrom: extfrom, Value: val}
|
|
|
+ if extfrom =="title"{
|
|
|
+ item.Score = 4
|
|
|
+ }
|
|
|
if tmp["scoreitem"] == nil {
|
|
|
sitems := make([]*ju.ScoreItem, 0)
|
|
|
sitems = append(sitems, &item)
|