分包清理

src/jy/extract/extpackage.go

@@ -27,7 +27,14 @@ func PackageDetail(j *ju.Job, e *ExtractTask) {
 						for key, val := range pkg.TableKV.Kv {
 							if tag.Key == key {
 								clearmap[k] = false
-								sonJobResult[k] = val
+								var tmpval interface{}
+								if len(e.ClearFn[k]) > 0 {
+									data := clear.DoClearFn(e.ClearFn[k], []interface{}{val, j.Content})
+									tmpval = data[0]
+								} else {
+									tmpval = val
+								}
+								sonJobResult[k] = tmpval
 								if packagenum == 1 {
 									field := &ju.ExtField{
 										Field:     k,
@@ -36,7 +43,7 @@ func PackageDetail(j *ju.Job, e *ExtractTask) {
 										Type:      "table",
 										MatchType: "tag_string",
 										ExtFrom:   "package",
-										Value:     val,
+										Value:     tmpval,
 										Score:     0,
 									}
 									j.Result[k] = append(j.Result[k], field)
@@ -49,7 +56,14 @@ func PackageDetail(j *ju.Job, e *ExtractTask) {
 						for key, val := range pkg.ColonKV.Kv {
 							if tag.Key == key {
 								clearmap[k] = true
-								sonJobResult[k] = val
+								var tmpval interface{}
+								if len(e.ClearFn[k]) > 0 {
+									data := clear.DoClearFn(e.ClearFn[k], []interface{}{val, j.Content})
+									tmpval = data[0]
+								} else {
+									tmpval = val
+								}
+								sonJobResult[k] = tmpval
 								if packagenum == 1 {
 									field := &ju.ExtField{
 										Field:     k,
@@ -58,7 +72,7 @@ func PackageDetail(j *ju.Job, e *ExtractTask) {
 										Type:      "colon",
 										MatchType: "tag_string",
 										ExtFrom:   "package",
-										Value:     val,
+										Value:     tmpval,
 										Score:     0,
 									}
 									j.Result[k] = append(j.Result[k], field)
@@ -71,7 +85,14 @@ func PackageDetail(j *ju.Job, e *ExtractTask) {
 						for key, val := range pkg.SpaceKV.Kv {
 							if tag.Key == key {
 								clearmap[k] = true
-								sonJobResult[k] = val
+								var tmpval interface{}
+								if len(e.ClearFn[k]) > 0 {
+									data := clear.DoClearFn(e.ClearFn[k], []interface{}{val, j.Content})
+									tmpval = data[0]
+								} else {
+									tmpval = val
+								}
+								sonJobResult[k] = tmpval
 								if packagenum == 1 {
 									field := &ju.ExtField{
 										Field:     k,
@@ -80,7 +101,7 @@ func PackageDetail(j *ju.Job, e *ExtractTask) {
 										Type:      "space",
 										MatchType: "tag_string",
 										ExtFrom:   "package",
-										Value:     val,
+										Value:     tmpval,
 										Score:     0,
 									}
 									j.Result[k] = append(j.Result[k], field)