From 9c2fcc695286743e53951ac61e86b87b61a987b3 Mon Sep 17 00:00:00 2001
From: mumuy <zhenghaole1990@126.com>
Date: Wed, 27 Apr 2016 16:44:32 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E5=A4=8D=E5=BC=9F=E5=BC=9F?=
 =?UTF-8?q?=E7=9A=84=E5=A6=B9=E5=A6=B9=E7=9A=84=E5=A6=B9=E5=A6=B9=E7=AD=89?=
 =?UTF-8?q?=E5=90=8C=E8=BE=88=E5=85=B3=E7=B3=BB=E5=A4=9A=E7=BA=A7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/relationship.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/script/relationship.js b/script/relationship.js
index 9380e63..64dfd93 100644
--- a/script/relationship.js
+++ b/script/relationship.js
@@ -74,12 +74,12 @@
 		},
 		/* 兄弟姐妹 */
 		{//哥哥姐姐的哥哥姐姐还是自己的哥哥姐姐(年龄判断)
-			exp:/,o[sb](,o[sb])/,
-			str:'$1'
+			exp:/(,o[sb])+(,o[sb])/,
+			str:'$2'
 		},
 		{//弟弟妹妹的弟弟妹妹还是自己的弟弟妹妹(年龄判断)
-			exp:/,l[sb](,l[sb])/,
-			str:'$1'
+			exp:/(,l[sb])+(,l[sb])/,
+			str:'$2'
 		},
 		{//如果自己是男性,兄弟姐妹的兄弟就是自己的兄弟或自己
 			con:/(,[fhs]|([olx]b)),[olx][sb],[olx]b/,
@@ -274,7 +274,7 @@
 		'f,xb,d,s':['堂外甥'],
 		'f,xb,d,d':['堂外甥女'],
 		'f,ob':['伯父','伯伯','大伯','二伯','三伯'],
-		'f,ob,w':['伯母','大娘'],	
+		'f,ob,w':['伯母','大娘'],
 		'f,lb':['叔叔','叔父','叔','二叔','三叔'],
 		'f,lb,w':['婶婶','婶母','婶'],
 		'f,m,xs,s&o':['表伯'],
@@ -563,7 +563,7 @@
 					if(selector==''&&sex1>-1&&sex1!=sex2){
 					}else{
 						selector = selector.substr(1); 	//去前面逗号
-						result.push(selector);						
+						result.push(selector);
 					}
 				}
 			}
@@ -586,11 +586,11 @@
 
 	function relationship(str){
 		var selectors = getSelectors(str);
-		// console.log('selectors#',selectors);
+		console.log('selectors#',selectors);
 		var result = [];							//匹配结果
 		for(var i = 0;i<selectors.length;i++){		//遍历所有可能性
 			var ids = selector2id(selectors[i]);
-			// console.log('ids#',ids);
+			console.log('ids#',ids);
 			for(var j=0;j<ids.length;j++){
 				var id = ids[j];
 				if(_data[id]){							//直接匹配称呼
@@ -613,7 +613,7 @@
 					}
 					for(var d=0;d<data.length;d++){
 						result.push(data[d][0]);
-					}	
+					}
 				}
 			}
 		}
@@ -623,7 +623,7 @@
 	window.relationship = relationship;
 })(window);
 
-// console.log(relationship('爸爸的爸爸的姐姐的儿子'));
+// console.log(relationship('姐姐的姐姐的姐姐'));
 //老公的老婆的儿子的爸爸的老婆的儿子的爸爸
 //我的三舅的儿子的爸爸的妹妹的儿子的叔叔的哥哥
-//老婆的外孙的姥姥
\ No newline at end of file
+//老婆的外孙的姥姥