Commit 2435485f by mushishixian

匹配修改

parent b948df87
...@@ -232,7 +232,7 @@ func getQuery(attrs []string) (query *es.BoolQuery) { ...@@ -232,7 +232,7 @@ func getQuery(attrs []string) (query *es.BoolQuery) {
nestedQuery = es.NewNestedQuery("attrs", subQuery) nestedQuery = es.NewNestedQuery("attrs", subQuery)
query.Should(nestedQuery) query.Should(nestedQuery)
} }
query.MinimumNumberShouldMatch(1) query.MinimumNumberShouldMatch(2)
} }
return query return query
......
...@@ -3,9 +3,9 @@ package mapping ...@@ -3,9 +3,9 @@ package mapping
var KeywordRegular = map[string]string{ var KeywordRegular = map[string]string{
//`^(.* )?([\d\.]+)(欧|欧姆|R|r)( .*)?$`: `$1$2Ω$4`, //`^(.* )?([\d\.]+)(欧|欧姆|R|r)( .*)?$`: `$1$2Ω$4`,
//`^(.* )?([\d\.]+)(U|u|μ)(.?)( .*)?$`: `$1$2Μ$4$5`, //`^(.* )?([\d\.]+)(U|u|μ)(.?)( .*)?$`: `$1$2Μ$4$5`,
"COG": "C0G", "COG": "C0G",
"NPO": "NP0", "NPO|NP0|nPO|npO|npo|nP0|np0": "C0G",
"华科|华新科技|华新科": "华新", "华科|华新科技|华新科": "华新",
`(欧姆|欧|O|o|R|r)`: "Ω", `(欧姆|欧|O|o|R|r)`: "Ω",
`(Uf|uf|μf|uF|UF)`: "μF", `(Uf|uf|μf|uF|UF)`: "μF",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment