docker/relationship
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated 修复“老婆的外孙的姥姥”不明确的问题

Browse Source
This commit is contained in:
郑浩乐 2016-03-22 13:40:12 +08:00
parent 573471f387
commit 9833f75c56
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
script/relationship.js
View File

@ -477,6 +477,13 @@
function selector2id(selector){ function selector2id(selector){
var result = []; var result = [];
var hash = {}; 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 getId = function(selector){
var s=''; var s='';
if(!hash[selector]){ if(!hash[selector]){
@ -502,10 +509,14 @@
break; break;
} }
} }
// console.log('selector#',selector);
}while(s!=selector); }while(s!=selector);
if(status){ if(status){
selector = selector.substr(1); //去前面逗号 if(selector==''&&sex1>-1&&sex1!=sex2){
result.push(selector); }else{
selector = selector.substr(1); //去前面逗号
result.push(selector);
}
} }
} }
} }
@ -564,14 +575,14 @@
window.relationship = relationship; window.relationship = relationship;
})(window); })(window);
// console.log(relationship('老婆的外孙的姥姥'));
//弟弟的爸爸的女儿 //弟弟的爸爸的女儿
//老婆的爸爸的女儿 //老婆的爸爸的女儿
//表哥的表哥 //表哥的表哥
//表哥的表妹
//大舅的女儿 //大舅的女儿
//表哥的姐姐 //表哥的姐姐
//爸爸的表姐 //爸爸的表姐
//表嫂的女儿的爸爸 //表嫂的女儿的爸爸
//老公的老婆的儿子的爸爸的老婆的儿子的爸爸 //老公的老婆的儿子的爸爸的老婆的儿子的爸爸
//我的三舅的儿子的爸爸的妹妹的儿子的叔叔的哥哥 //我的三舅的儿子的爸爸的妹妹的儿子的叔叔的哥哥
// console.log(relationship('表嫂的女儿的爸爸')); //老婆的外孙的姥姥