简称

src/jy/extract/extractInit.go

@@ -520,7 +520,7 @@ func InitDFA() {
 			arr := v1m["area"].([]interface{})
 			for _, k2 := range arr {
 				s := k2.(string)
-				for _, ss := range []string{s, cb + s, pb + s, k + s} { //淳安 杭州淳安 浙江淳安 浙江省淳安
+				for n, ss := range []string{s, cb + s, pb + s, k + s} { //淳安 杭州淳安 浙江淳安 浙江省淳安
 					cs := AreaToCity[ss]
 					AreaSimGet.AddWord(ss)
 					if cs != nil {
@@ -530,14 +530,18 @@ func InitDFA() {
 					}
 					AreaToCity[ss] = cs
 
-					//					d := &District{}
-					//					d.Name = ss
-					//					d.C = c
-					//					AreaDistrict.AddWord(ss) //加入区或县敏感词
-					//					ctmp := DistrictCityMap[ss]
-					//					if ctmp == nil {
-					//						DistrictCityMap[ss] = c
-					//					}
+					//只加入简称
+					if n == 0 {
+						d := &District{}
+						d.Name = ss
+						d.C = c
+						AreaDistrict.AddWord(ss) //加入区或县简称敏感词
+						ctmp := DistrictCityMap[ss]
+						if ctmp == nil {
+							DistrictCityMap[ss] = c
+						}
+					}
+
 				}
 			}
 		}

src/jy/extract/extractcity.go

@@ -98,6 +98,7 @@ func ExtractDistrict(field []string, bres bool, c, p, id string) (bool, string,
 							bres = true
 						} else { //对比抽到的城市省份是否一致
 							if c != ctmp || p != ptmp {
+								log.Println("str---", str, "====", word)
 								log.Println("district: City And Province, Inconsistent Before And After,Id:", id, c, p, ctmp, ptmp, d)
 								c = ctmp
 								p = ptmp
@@ -124,6 +125,7 @@ func ExtractDistrict(field []string, bres bool, c, p, id string) (bool, string,
 						}
 					}
 				}
+				return bres, p, c, d
 			}
 		}
 	}