6

src/jy/extract/extract.go

@@ -468,7 +468,6 @@ func file2text(doc *map[string]interface{}) {
 
 //抽取
 func (e *ExtractTask) ExtractProcess(j, jf *ju.Job, isSite bool) {
-	permissionExpired(e)
 	e.ExtractDetail(j, isSite, j.SpiderCode)
 	if jf != nil && jf.IsFile {
 		e.ExtractDetail(jf, isSite, j.SpiderCode)
@@ -2008,18 +2007,6 @@ func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
 			}
 		}
 		tmp["dataging"] = j.Dataging
-		if ju.NowTimeTest() {
-			tmptmp := map[string]interface{}{}
-			tmpnum := len(tmp) / 6
-			for k := range tmp {
-				if tmpnum < 0 {
-					break
-				}
-				tmptmp[k] = tmp[k]
-				tmpnum--
-			}
-			tmp = tmptmp
-		}
 		//budget bidamount
 		if bg, ok := tmp["budget"].(float64); ok && bg >= 500000000000 {
 			delete(tmp, "budget")
@@ -2479,20 +2466,3 @@ func RemoveReplicaSliceString(slc []string) []string {
 	}
 	return result
 }
-
-func permissionExpired(e *ExtractTask) {
-	if ju.NowTimeTest() {
-		e.RulePres = []*RegLuaInfo{}
-		e.RuleBacks = []*RegLuaInfo{}
-		e.SiteRuleBacks = []*RegLuaInfo{}
-		e.RuleBlock = &ju.RuleBlock{}
-		e.RuleCores = make(map[string]map[string][]*RuleCore)
-		e.SiteRuleCores = make(map[string]map[string][]*RuleCore)
-		e.PkgRuleCores = []*RuleCore{}
-		e.Tag = map[string][]*Tag{}
-		e.SiteTag = map[string][]*Tag{}
-		e.ClearFn = map[string][]string{}
-		e.SiteClearFn = map[string][]string{}
-		return
-	}
-}

src/jy/pretreated/analystep.go

@@ -15,7 +15,8 @@ import (
 )
 
 var yjReg *regexp.Regexp = regexp.MustCompile("(打分表|负责人|单位|个人|投标人|项目|企业)业绩|主要人员相关资料|投标文件格式|唱标记录|否决投标的?情况说明")
-var hisReg = regexp.MustCompile("(开标记录|业绩|[得评]+[审打]{0,2}分情况|无效标)[：:\n]*.*?[\n]?(</td>)")var hisReg2 = regexp.MustCompile("(开标记录|业绩|[得评]+[审打]{0,2}分情况|无效标)[：:\n]*.*?[\n]?(</tr>|</table>|</td>)")
+var hisReg = regexp.MustCompile("(开标记录|类似业绩|历史业绩|填报项目业绩|[得评]+[审打]{0,2}分情况|无效标)[：:\n]*.*?[\n]?(</td>)")
+var hisReg2 = regexp.MustCompile("(开标记录|业绩|[得评]+[审打]{0,2}分情况|无效标)[：:\n]*.*?[\n]?(</tr>|</table>|</td>)")
 var formattext = regexp.MustCompile("(投标总价)([0-9,.万元]*)")
 var formattext2 = regexp.MustCompile("中标单价.*(中标总价.*)")
 var formattext3 = regexp.MustCompile("(同类项目业绩、)")

src/jy/pretreated/tablev2.go

@@ -824,7 +824,6 @@ func CheckHeader(txt string) (res, must bool, stype, reg, repl string) {
 con 文本
 strtype 1全文 2块文本
 **/
-var hisReg = regexp.MustCompile("类似业绩|历史业绩|开标记录|填报项目业绩")
 
 func ComputeConRatio(con string, strtype int) (tabs []*goquery.Selection, ratio float32) {
 	defer qutil.Catch()