|
|
@@ -6,6 +6,7 @@ package pretreated
|
|
|
import (
|
|
|
"encoding/json"
|
|
|
"jy/util"
|
|
|
+ //"log"
|
|
|
"strings"
|
|
|
|
|
|
"github.com/PuerkitoBio/goquery"
|
|
|
@@ -63,9 +64,6 @@ func AnalyStart(job *util.Job) {
|
|
|
tabres := AnalyTableV2(tabs[i], job.Category, "", con, 1, job.SourceMid, job.RuleBlock) //解析表格入口 返回：汇总表格对象
|
|
|
processTableResult(tabres, bl, job)
|
|
|
}
|
|
|
- // for k, v := range bl.TableKV.Kv {
|
|
|
- // //log.Println("bl.TableKV.Kv", k, v)
|
|
|
- // }
|
|
|
} else {
|
|
|
//从正文里面找分包
|
|
|
job.BlockPackage = FindPackageFromText(job.Title, newCon)
|
|
|
@@ -195,6 +193,8 @@ func processTableResult(tabres *TableResult, block *util.Block, job *util.Job) {
|
|
|
Key: tk,
|
|
|
Value: tvv.Value,
|
|
|
})
|
|
|
+ }else if tabres.KvTags[tk] == nil{
|
|
|
+ block.TableKV.KvTags[tk] = tv
|
|
|
}
|
|
|
}
|
|
|
}
|
fengweiqiang