|
|
@@ -254,7 +254,7 @@ func (e *ExtractTask) ExtractProcess(j *ju.Job) {
|
|
|
|
|
|
//fmt.Println("-----------", j.Province, j.City, j.BuyerAddr, j.Title) //j.Address
|
|
|
//ExtractPC(j.Result, j.Province, j.City, j.Title, j.BuyerAddr, j.SourceMid) //j.Address
|
|
|
- ExtractPC2(j.Result, "Province", "City", "Title", "Addr", j.SourceMid)
|
|
|
+ //ExtractPC2(j.Result, "Province", "City", "Title", "Addr", j.SourceMid)
|
|
|
//分析抽取结果并保存 todo
|
|
|
AnalysisSaveResult(j.Data, j.Result, e.TaskInfo)
|
|
|
|
|
|
@@ -455,19 +455,21 @@ func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]
|
|
|
//log.Println("tkv", tkv)
|
|
|
for k, v := range tkv.Kv {
|
|
|
if k == fieldname {
|
|
|
- //log.Println(k, v, tags[-tkv.KvIndex[fieldname]].Key)
|
|
|
- kvmap[field] = append(kvmap[field], map[string]interface{}{
|
|
|
- "field": field,
|
|
|
- "code": in.Code,
|
|
|
- "ruletext": tags[-tkv.KvIndex[fieldname]].Key,
|
|
|
- "extfrom": "table",
|
|
|
- "value": v,
|
|
|
- "type": "table",
|
|
|
- "matchtype": "tag_string",
|
|
|
- })
|
|
|
+ if len(tags) > -tkv.KvIndex[fieldname] {
|
|
|
+ kvmap[field] = append(kvmap[field], map[string]interface{}{
|
|
|
+ "field": field,
|
|
|
+ "code": in.Code,
|
|
|
+ "ruletext": tags[-tkv.KvIndex[fieldname]].Key,
|
|
|
+ "extfrom": "table",
|
|
|
+ "value": v,
|
|
|
+ "type": "table",
|
|
|
+ "matchtype": "tag_string",
|
|
|
+ })
|
|
|
+ } else { //涉及其他待处理
|
|
|
+ //log.Println(tags)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
// kv := bl.TableKV.Kv
|
|
|
// for _, tag := range tags {
|
|
|
// for k, val := range kv {
|
