Mterge branch 'dev3.1.2' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.1.2

src/jy/extract/extract.go

@@ -894,6 +894,12 @@ func AnalysisSaveResult(j *ju.Job, e *ExtractTask) {
 		}
 		if e.TaskInfo.TestColl == "" {
 			if len(tmp) > 0 { //保存抽取结果
+				for field, _ := range e.Fields {
+					if tmp[field] == nil {
+						tmp[field] = "" //覆盖之前版本数据
+					}
+				}
+				tmp["repeat"] = 0
 				tmparr := []map[string]interface{}{
 					map[string]interface{}{
 						"_id": qu.StringTOBsonId(_id),

src/jy/extract/extractInit.go

@@ -64,6 +64,7 @@ type ExtractTask struct {
 	Tag           map[string][]*Tag   //标签库
 	ClearFn       map[string][]string //清理函数
 	IsExtractCity bool                //是否开启城市抽取
+	Fields        map[string]int      //抽取属性组
 
 	ResultChanel chan bool                  //抽取结果详情
 	ResultArr    [][]map[string]interface{} //抽取结果详情
@@ -261,6 +262,7 @@ func (e *ExtractTask) InitRuleBacks() {
 //加载抽取规则
 func (e *ExtractTask) InitRuleCore() {
 	defer qu.Catch()
+	e.Fields = map[string]int{}
 	e.RuleCores = []*RuleCore{}
 	vinfos, _ := db.Mgo.Find("versioninfo", `{"vid":"`+e.TaskInfo.VersionId+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, vinfo := range *vinfos {
@@ -357,8 +359,10 @@ func (e *ExtractTask) InitRuleCore() {
 				if b, _ := v["isuse"].(bool); !b {
 					continue
 				}
+				field := qu.ObjToString(v["s_field"])
+				e.Fields[field] = 1 //加入抽取属性组备用
 				rinfo := &RegLuaInfo{
-					Field: qu.ObjToString(v["s_field"]),
+					Field: field,
 					Code:  v["s_code"].(string),
 					Name:  v["s_name"].(string),
 					IsLua: qu.If(v["s_type"].(string) == "1", true, false).(bool),

src/res/fieldscore.json

@@ -172,7 +172,7 @@
         "position": [
             {
                 "describe": "全为中文汉字或符号",
-                "regstr": "^[\\u4e00-\\u9fa5（）()【】\\\\[\\\\]、，：:《》]+$",
+                "regstr": "^[\\u4e00-\\u9fa5（）()【】\\\\[\\\\],，。、：:《》]+$",
                 "score": -20
             },
             {
@@ -189,12 +189,12 @@
         "length": [
             {
                 "describe": "长度打分min>val:-1,min<=val<=max:1,max<val:-1",
-                "min": 6,
-                "max": 25,
+                "min": 3,
+                "max": 30,
                 "score": [
-                    -1,
+                    -10,
                     1,
-                    -1
+                    -10
                 ]
             }
         ]