# HG changeset patch # User one # Date 1414336604 -32400 # Node ID 54ac3718ab243dad28156817a1612f4d53ef15f8 # Parent f93d15042315a69fc5d5ed08c559ae024afc2836# Parent 2ecced39700771cf42011cd7c576b41cc836336c Merge with 2ecced39700771cf42011cd7c576b41cc836336c diff -r f93d15042315 -r 54ac3718ab24 src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java --- a/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java Mon Oct 27 00:14:35 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java Mon Oct 27 00:16:44 2014 +0900 @@ -5,9 +5,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import fj.Ord; -import fj.P2; -import fj.data.TreeMap; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.NodePath; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; diff -r f93d15042315 -r 54ac3718ab24 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/roleIdsTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/roleIdsTest.java Mon Oct 27 00:14:35 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/functionTest/roleIdsTest.java Mon Oct 27 00:16:44 2014 +0900 @@ -16,7 +16,8 @@ Iterator<String> orgIds = jugrix.roleIds("o:6"); orgIds.hasNext(); Assert.assertEquals(orgIds.next(),"r:18"); - + Assert.assertFalse(orgIds.hasNext()); + Iterator<String> personIds = jugrix.roleIds("p:1"); personIds.hasNext(); Assert.assertEquals(personIds.next(),"r:10"); diff -r f93d15042315 -r 54ac3718ab24 xml/Person.xml --- a/xml/Person.xml Mon Oct 27 00:14:35 2014 +0900 +++ b/xml/Person.xml Mon Oct 27 00:16:44 2014 +0900 @@ -838,11 +838,10 @@ <lastName></lastName> <name>春田義幸</name> <nameReading>はるたよしゆき</nameReading> - <roleRefIds>r:10 r:34</roleRefIds> + <roleRefIds>r:34</roleRefIds> <parentOrganizations type="OrganizationMappedByRole"> <OrganizationMappedByRole type="OrganizationMappedByRole"> <organizationRefId>o:2</organizationRefId> - <roleRefId>r:10</roleRefId> </OrganizationMappedByRole> <OrganizationMappedByRole type="OrganizationMappedByRole"> <organizationRefId>o:11</organizationRefId> @@ -851,10 +850,6 @@ </parentOrganizations> <priorities type="PriorityMappedByRole"> <PriorityMappedByRole type="PriorityMappedByRole"> - <priority>0</priority> - <roleRefId>r:10</roleRefId> - </PriorityMappedByRole> - <PriorityMappedByRole type="PriorityMappedByRole"> <priority>1</priority> <roleRefId>r:34</roleRefId> </PriorityMappedByRole>