|
@@ -56,8 +56,7 @@ func AnalyStart(job *util.Job) {
|
|
|
newCon = TextAfterRemoveTable(con)
|
|
|
job.BlockPackage = FindPackageFromText(job.Title, newCon)
|
|
|
for i := 0; i < len(tabs); i++ {
|
|
|
- tabtmp := &util.Block{}
|
|
|
- tabtmp.Text = tabs[i].Text()
|
|
|
+
|
|
|
//添加标识:文本中有table
|
|
|
tabres := AnalyTableV2(tabs[i], job.Category, "", con, 1, job.SourceMid, job.RuleBlock) //解析表格入口 返回:汇总表格对象
|
|
|
processTableResult(tabres, bl, job)
|
|
@@ -88,14 +87,11 @@ func processTableInBlock(bl *util.Block, job *util.Job) {
|
|
|
for _, tab := range tabs {
|
|
|
job.HasTable = 1
|
|
|
//添加标识:文本中有table
|
|
|
- tmpblock := &util.Block{}
|
|
|
- tmpblock.Text = tab.Text()
|
|
|
- tabres := AnalyTableV2(tab, job.Category, bl.Title, tmpblock.Text, 2, job.SourceMid, job.RuleBlock) //解析表格入口 返回:汇总表格对象
|
|
|
+ tabres := AnalyTableV2(tab, job.Category, bl.Title, tab.Text(), 2, job.SourceMid, job.RuleBlock) //解析表格入口 返回:汇总表格对象
|
|
|
processTableResult(tabres, bl, job) //分析table解析结果
|
|
|
if bl.Title == "" && tabres.BlockTag != "" {
|
|
|
bl.Title = tabres.BlockTag
|
|
|
}
|
|
|
- job.Block = append(job.Block, tmpblock)
|
|
|
}
|
|
|
}
|
|
|
|