站点管理

src/jy/clear/tonumber.go

@@ -99,12 +99,12 @@ func ObjToMoney(data []interface{}) []interface{} {
 			f = f * 10000
 		}
 	}
+	data[0] = f
 	if f == 0 && !moneyUnitRegBool.MatchString(fmt.Sprint(tmpstr)) {
 		data = append(data, false)
 		return data
 	}
 	data = append(data, true)
-	data[0] = f
 	return data
 }
 //["中标金额","成交金额","合同金额","中标价","成交价","成交价格","中标(成交)金额","投标报价","中标标价","成交结果"]

src/jy/extract/extract.go

@@ -336,21 +336,27 @@ func (e *ExtractTask) PreInfo(doc map[string]interface{}) (j, jf *ju.Job, isSite
 			IsFile:     isextFile,
 		}
 	}
-	//是否配置站点
 	codeSite := j.SpiderCode
-	exp, isSite := e.Luacodes.Load(codeSite)
-	if isSite {
-		if exp.(map[string]interface{})["e.SiteClearFn"] != nil {
-			e.SiteClearFn = exp.(map[string]interface{})["e.SiteClearFn"].(map[string][]string)
-		}
-		if exp.(map[string]interface{})["e.SiteTag"] != nil {
-			e.SiteTag = exp.(map[string]interface{})["e.SiteTag"].(map[string][]*Tag)
-		}
-		if exp.(map[string]interface{})["e.SiteRuleCores"] != nil {
-			e.SiteRuleCores = exp.(map[string]interface{})["e.SiteRuleCores"].(map[string]map[string][]*RuleCore)
-		}
-		if exp.(map[string]interface{})["e.SiteRuleBacks"] != nil {
-			e.SiteRuleBacks = exp.(map[string]interface{})["e.SiteRuleBacks"].([]*RegLuaInfo)
+	//是否启用站点
+	if value, ok := e.SiteMerge.Load(codeSite); ok {
+		isSite = value.(bool)
+	}
+	if isSite{
+		//是否配置站点
+		exp, isSite := e.Luacodes.Load(codeSite)
+		if isSite {
+			if exp.(map[string]interface{})["e.SiteClearFn"] != nil {
+				e.SiteClearFn = exp.(map[string]interface{})["e.SiteClearFn"].(map[string][]string)
+			}
+			if exp.(map[string]interface{})["e.SiteTag"] != nil {
+				e.SiteTag = exp.(map[string]interface{})["e.SiteTag"].(map[string][]*Tag)
+			}
+			if exp.(map[string]interface{})["e.SiteRuleCores"] != nil {
+				e.SiteRuleCores = exp.(map[string]interface{})["e.SiteRuleCores"].(map[string]map[string][]*RuleCore)
+			}
+			if exp.(map[string]interface{})["e.SiteRuleBacks"] != nil {
+				e.SiteRuleBacks = exp.(map[string]interface{})["e.SiteRuleBacks"].([]*RegLuaInfo)
+			}
 		}
 	}
 	qu.Try(func() {