From f78dea420aa3e6cb176f57961d91dbd327530903 Mon Sep 17 00:00:00 2001 From: mumuy Date: Mon, 1 Aug 2016 17:29:08 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E5=85=BC=E5=AE=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=BA=8F=E6=95=B0=E8=AF=8D=E7=BB=9F=E4=B8=80=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BAx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/relationship.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/script/relationship.js b/script/relationship.js index 20abd59..4848fd9 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -204,7 +204,7 @@ 'f,f,m,xs,s&o,w':['表伯祖母'], 'f,f,m,xs,s&l':['表叔祖父'], 'f,f,m,xs,s&l,w':['表叔祖母'], - 'f,f,xb':['堂祖父','二爷爷','三爷爷'], + 'f,f,xb':['堂祖父','x爷爷'], 'f,f,xb,w':['堂祖母'], 'f,f,xb,s&o':['堂伯','堂伯父'], 'f,f,xb,s&o,w':['堂伯母'], @@ -275,9 +275,9 @@ 'f,xb,d&l,h':['堂妹夫'], 'f,xb,d,s':['堂外甥'], 'f,xb,d,d':['堂外甥女'], - 'f,ob':['伯父','伯伯','大伯','二伯','三伯'], + 'f,ob':['伯父','伯伯','大伯','x伯'], 'f,ob,w':['伯母','大娘'], - 'f,lb':['叔叔','叔父','阿叔','叔','二叔','三叔','仲父'], + 'f,lb':['叔叔','叔父','阿叔','叔','仲父','x叔'], 'f,lb,w':['婶婶','婶母','阿婶','家婶','婶','季母'], //姑家 'f,xs':['姑妈','姑母','姑姑','姑'], @@ -321,7 +321,7 @@ 'm,f,m,xb,w':['外太舅母','外太舅婆'], 'm,f,m,xs':['外太姨婆'], 'm,f,m,xs,h':['外太姑姨公'], - 'm,f,xb':['xx姥爷','二姥爷','三姥爷'], + 'm,f,xb':['小姥爷','x姥爷'], 'm,f,xb,s':['堂舅','堂舅父'], 'm,f,xb,s,w':['堂舅妈','堂舅母'], 'm,f,xb,d':['堂姨'], @@ -352,8 +352,8 @@ 'm,m,xs,d':['表姨','表姨母','表姨妈','表阿姨'], 'm,m,xs,d,h':['表姨丈','表姨父'], //舅家 - 'm,xb':['舅舅','舅父','舅','娘舅','舅仔','二舅','三舅'], - 'm,xb,w':['舅妈','舅母','妗妗','妗母','阿妗','二舅妈','三舅妈'], + 'm,xb':['舅舅','舅父','舅','娘舅','舅仔','x舅'], + 'm,xb,w':['舅妈','舅母','妗妗','妗母','阿妗','x舅妈'], 'm,xb,s&o':['表哥(舅家)','表哥'], 'm,xb,s&o,w':['表嫂(舅家)','表嫂'], 'm,xb,s&l':['表弟(舅家)','表弟'], @@ -379,8 +379,8 @@ 'm,lb':['小舅','舅父仔'], 'm,lb,w':['小舅妈'], //姨家 - 'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','姨','二姨','三姨','二姨妈','三姨妈'], - 'm,xs,h':['姨丈','姨夫','姨父','二姨父','三姨父'], + 'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','姨','x姨','x姨妈'], + 'm,xs,h':['姨丈','姨夫','姨父','x姨父'], 'm,xs,s&o':['表哥(姨家)','表哥'], 'm,xs,s&o,w':['表嫂(姨家)','表嫂'], 'm,xs,s&l':['表弟(姨家)','表弟'], @@ -658,6 +658,7 @@ //分词解析 function getSelectors(str){ + str = str.replace(/二|三|四|五|六|七|八|九|十/g,'x'); var lists = str.split('的'); var result = []; //所有可能性 var match = true;