删除jsoncontent

src/jy/extract/extract.go

@@ -319,6 +319,9 @@ func (e *ExtractTask) PreInfo(doc map[string]interface{}) (j, jf *ju.Job, isSite
 		BuyerAddr: qu.ObjToString(doc["buyeraddr"]),
 		RuleBlock: e.RuleBlock,
 	}
+	if (j.Jsondata != nil||(*j.Jsondata) != nil)  && (*j.Jsondata)["jsoncontent"]!= nil{
+		delete((*j.Jsondata),"jsoncontent")
+	}
 	if isextFile {
 		jf = &ju.Job{
 			SourceMid:  qu.BsonIdToSId(doc["_id"]),
@@ -336,6 +339,9 @@ func (e *ExtractTask) PreInfo(doc map[string]interface{}) (j, jf *ju.Job, isSite
 			RuleBlock:  e.RuleBlock,
 			IsFile:     isextFile,
 		}
+		if (jf.Jsondata != nil||(*jf.Jsondata) != nil)  && (*jf.Jsondata)["jsoncontent"]!= nil{
+			delete((*jf.Jsondata),"jsoncontent")
+		}
 	}
 	codeSite := j.SpiderCode
 	//是否启用站点

src/jy/pretreated/analytable.go

@@ -199,9 +199,9 @@ func CommonDataAnaly(k, tabletag, tabledesc string, v interface{}, isSite bool,
 			if filter_tag_zb.MatchString(tabletag) || filter_tag_zb.MatchString(tabledesc) {
 				//u.Debug(v1, k, "-----", filter_zbdw_jd.MatchString(k), filter_zbdw_v.MatchString(v1))
 				if filter_zbje_jd.MatchString(k) && !filter_zbje_kn.MatchString(k) && filter_zbje_v.MatchString(v1) {
-					if filter_ysje_jd.MatchString(k){
+					if filter_ysje_jd.MatchString(k) {
 						kvTags["预算金额"] = append(kvTags["预算金额"], &u.Tag{Key: k, Value: v1, Weight: -100})
-					}else if  !filter_zbdw_kn.MatchString(k) {
+					} else if !filter_zbdw_kn.MatchString(k) {
 						kvTags["中标金额"] = append(kvTags["中标金额"], &u.Tag{Key: k, Value: v1, Weight: -100})
 					}
 
@@ -2130,27 +2130,41 @@ func (tn *Table) manyPackageProcessByIndex(index []string, standIndex_pos []int,
 			//}
 			for _, vcgdw := range k1tags {
 				if vcgdw.Value == "采购单位" {
-				}else if vcgdw.Value=="预算"&&len(val) == len(index){
-					for bi,bv := range index{
-						if tn.BlockPackage.Map[bv].(*u.BlockPackage).Budget == 0{
+				} else if vcgdw.Value == "预算" && len(val) == len(index) {
+					for bi, bv := range index {
+						if tn.BlockPackage.Map[bv].(*u.BlockPackage).Budget == 0 {
 							moneys := clear.ObjToMoney([]interface{}{val[bi], ""})
-							tn.BlockPackage.Map[bv].(*u.BlockPackage).Budget = moneys[0].(float64)
-							tn.BlockPackage.Map[bv].(*u.BlockPackage).IsTrueBudget = moneys[len(moneys)-1].(bool)
+							if len(moneys) > 0 {
+								if vf, ok := moneys[0].(float64); ok {
+									tn.BlockPackage.Map[bv].(*u.BlockPackage).Budget = vf
+									tn.BlockPackage.Map[bv].(*u.BlockPackage).IsTrueBudget = moneys[len(moneys)-1].(bool)
+								} else if vi, ok := moneys[0].(int); ok {
+									tn.BlockPackage.Map[bv].(*u.BlockPackage).Budget = float64(vi)
+									tn.BlockPackage.Map[bv].(*u.BlockPackage).IsTrueBudget = moneys[len(moneys)-1].(bool)
+								}
+							}
 						}
 					}
-				}else if vcgdw.Value == "中标金额"{
-					for bi,bv := range index{
-						if tn.BlockPackage.Map[bv].(*u.BlockPackage).Bidamount == 0{
+				} else if vcgdw.Value == "中标金额" {
+					for bi, bv := range index {
+						if tn.BlockPackage.Map[bv].(*u.BlockPackage).Bidamount == 0 {
 							moneys := clear.ObjToMoney([]interface{}{val[bi], ""})
-							tn.BlockPackage.Map[bv].(*u.BlockPackage).Bidamount = moneys[0].(float64)
-							tn.BlockPackage.Map[bv].(*u.BlockPackage).IsTrueBidamount = moneys[len(moneys)-1].(bool)
+							if len(moneys) > 0 {
+								if vf, ok := moneys[0].(float64); ok {
+									tn.BlockPackage.Map[bv].(*u.BlockPackage).Bidamount = vf
+									tn.BlockPackage.Map[bv].(*u.BlockPackage).IsTrueBidamount = moneys[len(moneys)-1].(bool)
+								} else if vi, ok := moneys[0].(int); ok {
+									tn.BlockPackage.Map[bv].(*u.BlockPackage).Bidamount = float64(vi)
+									tn.BlockPackage.Map[bv].(*u.BlockPackage).IsTrueBidamount = moneys[len(moneys)-1].(bool)
+								}
+							}
 						}
 					}
-				}else if vcgdw.Value == "中标单位"{
-					for _,bv := range index{
-						if tn.BlockPackage.Map[bv].(*u.BlockPackage).WinnerOrder == nil ||len(tn.BlockPackage.Map[bv].(*u.BlockPackage).WinnerOrder) == 0{
+				} else if vcgdw.Value == "中标单位" {
+					for _, bv := range index {
+						if tn.BlockPackage.Map[bv].(*u.BlockPackage).WinnerOrder == nil || len(tn.BlockPackage.Map[bv].(*u.BlockPackage).WinnerOrder) == 0 {
 							continue
-						}else {
+						} else {
 							tn.BlockPackage.Map[bv].(*u.BlockPackage).Winner = qutil.ObjToString(tn.BlockPackage.Map[bv].(*u.BlockPackage).WinnerOrder[0]["entname"])
 						}
 					}
@@ -3306,7 +3320,7 @@ func initLineMapLineMapArr(table *Table) (lineMapArr map[string]*SortMap, lineMa
 	for _, key := range table.SortKV.Keys { //遍历table.SortKV.Keys而不是直接遍历table.SortKV.Map是为了得到table头的顺序
 		val := table.SortKV.Map[key]
 		key = regReplAllSpace.ReplaceAllString(key, "")
-		key = strings.Replace(key, "", "", -1)    //处理一个特殊的采购量 经上层处理空格后未处理掉
+		key = strings.Replace(key, "", "", -1) //处理一个特殊的采购量 经上层处理空格后未处理掉
 		if realTypeVal, ok := val.([]string); ok { //val为数组 {"数量":["1","2","3"]}
 			/*
 				{

src/jy/pretreated/tablev2.go

@@ -494,6 +494,9 @@ func (tr *TR) AddTD(td *TD) {
 		tr.TDs[len(tr.TDs)-1].RightNode = td
 	}
 	**/
+	if tr.TDs == nil{
+		return
+	}
 	td.ColPos = len(tr.TDs)
 	tr.TDs = append(tr.TDs, td)
 }