From 9833f75c56db42a354cd081d14a72a2fdbbafdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=B5=A9=E4=B9=90?= <89932980@qq.com>
Date: Tue, 22 Mar 2016 13:40:12 +0800
Subject: [PATCH] =?UTF-8?q?updated=20=E4=BF=AE=E5=A4=8D=E2=80=9C=E8=80=81?=
 =?UTF-8?q?=E5=A9=86=E7=9A=84=E5=A4=96=E5=AD=99=E7=9A=84=E5=A7=A5=E5=A7=A5?=
 =?UTF-8?q?=E2=80=9D=E4=B8=8D=E6=98=8E=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/relationship.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/script/relationship.js b/script/relationship.js
index 901e5f7..5bbb949 100644
--- a/script/relationship.js
+++ b/script/relationship.js
@@ -477,6 +477,13 @@
 	function selector2id(selector){
 		var result = [];
 		var hash = {};
+		var sex1 = sex2 = -1;//自己或对方性别:-1未知,0女性,1男性
+		if(selector.indexOf(',w')==0){
+			sex1 = 1;
+		}else if(selector.indexOf(',h')==0){
+			sex1 = 0;
+		}
+		sex2 = selector.match(/,[mw]|([olx]s)|(d(&[ol]))$/)?0:1;
 		var getId = function(selector){
 			var s='';
 			if(!hash[selector]){
@@ -502,10 +509,14 @@
 							break;
 						}
 					}
+					// console.log('selector#',selector);
 				}while(s!=selector);
 				if(status){
-					selector = selector.substr(1); 	//去前面逗号
-					result.push(selector);
+					if(selector==''&&sex1>-1&&sex1!=sex2){
+					}else{
+						selector = selector.substr(1); 	//去前面逗号
+						result.push(selector);						
+					}
 				}
 			}
 		}
@@ -564,14 +575,14 @@
 	window.relationship = relationship;
 })(window);
 
+// console.log(relationship('老婆的外孙的姥姥'));
 //弟弟的爸爸的女儿
 //老婆的爸爸的女儿
 //表哥的表哥
-//表哥的表妹
 //大舅的女儿
 //表哥的姐姐
 //爸爸的表姐
 //表嫂的女儿的爸爸
 //老公的老婆的儿子的爸爸的老婆的儿子的爸爸
 //我的三舅的儿子的爸爸的妹妹的儿子的叔叔的哥哥
-// console.log(relationship('表嫂的女儿的爸爸'));
\ No newline at end of file
+//老婆的外孙的姥姥
\ No newline at end of file