|
|
@@ -7,7 +7,6 @@ import (
|
|
|
"encoding/json"
|
|
|
"jy/util"
|
|
|
"log"
|
|
|
- //"log"
|
|
|
"strings"
|
|
|
|
|
|
"github.com/PuerkitoBio/goquery"
|
|
|
@@ -57,7 +56,6 @@ func AnalyStart(job *util.Job) {
|
|
|
newCon = TextAfterRemoveTable(con)
|
|
|
job.BlockPackage = FindPackageFromText(job.Title, newCon)
|
|
|
for i := 0; i < len(tabs); i++ {
|
|
|
-
|
|
|
//添加标识:文本中有table
|
|
|
tabres := AnalyTableV2(tabs[i], job.Category, "", con, 1, job.SourceMid, job.RuleBlock) //解析表格入口 返回：汇总表格对象
|
|
|
processTableResult(tabres, bl, job)
|
|
|
@@ -70,7 +68,7 @@ func AnalyStart(job *util.Job) {
|
|
|
job.BlockPackage = FindPackageFromText(job.Title, newCon)
|
|
|
}
|
|
|
FindProjectCode(newCon, job) //匹配项目编号
|
|
|
- bl.Text = newCon
|
|
|
+ bl.Text = HtmlToText(con)
|
|
|
//调用kv解析
|
|
|
bl.ColonKV = GetKVAll(newCon, "", nil, 1)
|
|
|
bl.SpaceKV = SspacekvEntity.Entrance(newCon, "", nil)
|
|
|
@@ -78,6 +76,7 @@ func AnalyStart(job *util.Job) {
|
|
|
if job.Winnerorder == nil || len(job.Winnerorder) == 0 {
|
|
|
bl.Winnerorder = winnerOrderEntity.Find(bl.Text, true, 1)
|
|
|
}
|
|
|
+ //log.Println(bl.Text)
|
|
|
job.Block = append(job.Block, bl)
|
|
|
}
|
|
|
}
|
