文本转换

src/jy/pretreated/analystep.go

@@ -71,8 +71,9 @@ func AnalyStart(job *util.Job) {
 			//从正文里面找分包
 			job.BlockPackage = FindPackageFromText(job.Title, newCon)
 		}
-		FindProjectCode(newCon, job) //匹配项目编号
 		bl.Text = HtmlToText(con)
+		//log.Println(bl.Text)
+		FindProjectCode(bl.Text, job) //匹配项目编号
 		//调用kv解析
 		bl.ColonKV = GetKVAll(bl.Text, "", nil, 1)
 		bl.SpaceKV = SspacekvEntity.Entrance(bl.Text, "", nil)
@@ -81,7 +82,6 @@ func AnalyStart(job *util.Job) {
 			bl.Winnerorder = winnerOrderEntity.Find(bl.Text, true, 1)
 			job.Winnerorder = bl.Winnerorder
 		}
-		//log.Println(bl.Text)
 		job.Block = append(job.Block, bl)
 	}
 }

src/jy/pretreated/tablev2.go

@@ -877,6 +877,11 @@ func ComputeConRatio(con string, strtype int) (tabs []*goquery.Selection, ratio
 //纯文本
 func HtmlToText(con string) string {
 	doc2, _ := goquery.NewDocumentFromReader(strings.NewReader(con))
+	//log.Println(doc2.Html())
+	doc2.Find("tr").Each(func(i int, selection *goquery.Selection) {
+		selection.AfterHtml(string(rune(10)))
+	})
+	//log.Println(doc2.Html())
 	return doc2.Text()
 }