fengweiqiang před 4 roky
rodič
revize
770163c35e
1 změnil soubory, kde provedl 3 přidání a 4 odebrání
  1. 3 4
      src/jy/extract/extract.go

+ 3 - 4
src/jy/extract/extract.go

@@ -313,9 +313,8 @@ func (e *ExtractTask) PreInfo(doc map[string]interface{}) (j, jf *ju.Job, isSite
 	if subtype == "" {
 		subtype = "all"
 	}
-	if toptype == "其它" || subtype == "其它" || subtype == "其他" || subtype == "结果变更" {
-		toptype = "all"
-		subtype = "all"
+	if subtype == "其他" {
+		subtype = "其它"
 	}
 	toMap := qu.ObjToMap(doc["jsondata"])
 	//log.Debug("toMap", toMap)
@@ -1254,7 +1253,7 @@ func getKvByLuaFields(vc *RuleCore, j *ju.Job, et *ExtractTask) (map[string][]ma
 	return kvmap, true
 }
 
-func extractFromKv(field, fieldname string, blocks []*ju.Block, vc *RuleCore, kvmap map[string][]map[string]interface{}, Category string) () {
+func extractFromKv(field, fieldname string, blocks []*ju.Block, vc *RuleCore, kvmap map[string][]map[string]interface{}, Category string) {
 	//qu.Debug("fieldname+++", fieldname)
 	for _, bl := range blocks {
 		tp := ""