# HG changeset patch # User one # Date 1414400783 -32400 # Node ID 6f9439ca3eb52bb7c45ac9c929f5ac7cc3bb9e8e # Parent 96b9017b0e448c256baeaf66970a58813b050851 change name find to findInSubTree diff -r 96b9017b0e44 -r 6f9439ca3eb5 src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/ReadXmlHandler.java --- a/src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/ReadXmlHandler.java Mon Oct 27 12:06:11 2014 +0900 +++ b/src/main/java/ac/jp/u_ryukyu/cr/ie/tatsuki/xmlReader/ReadXmlHandler.java Mon Oct 27 18:06:23 2014 +0900 @@ -41,19 +41,19 @@ this.editor = either.b(); path = path.add(num); - System.out.println(path.toString()); + //System.out.println(path.toString()); if (uri != "") { - System.out.println("namespaceURI= " + uri); + // System.out.println("namespaceURI= " + uri); } if (localName != "") { - System.out.println("localName= " + localName); + // System.out.println("localName= " + localName); } if (qName != "") { - System.out.println("qName= " + qName); + // System.out.println("qName= " + qName); Either newEither = editor.putAttribute(path, "element", ByteBuffer.wrap(qName.getBytes())); if (newEither.isA()) { //error @@ -63,7 +63,7 @@ if (attributes.getLength() != 0) { for (int count = 0 ;attributes.getLength() > count; count++) { - System.out.println(attributes.getLocalName(count) + " = " + attributes.getValue(count)); + // System.out.println(attributes.getLocalName(count) + " = " + attributes.getValue(count)); Either newEither = editor.putAttribute(path,attributes.getLocalName(count) , ByteBuffer.wrap(attributes.getValue(count).getBytes())); if (newEither.isA()) { //error @@ -83,7 +83,7 @@ if (!macher.find()) { Pair nodePair = path.last(); NodePath onePath = nodePair.right(); - System.out.println(str); + //System.out.println(str); Either newEither = editor.putAttribute(onePath, "text", ByteBuffer.wrap(str.getBytes())); if (newEither.isA()) { //error @@ -96,20 +96,20 @@ public void endElement(String namespaceURI, String localName, String qName) { path = path.tail(); if (namespaceURI != "") { - System.out.println("namespaceURI= " + namespaceURI); + // System.out.println("namespaceURI= " + namespaceURI); } if (localName != "") { - System.out.println("localName= " + localName); + // System.out.println("localName= " + localName); } if (qName != "") { - System.out.println("qName= " + qName); + // System.out.println("qName= " + qName); } } @Override public void startDocument() { - System.out.println("start"); + // System.out.println("start"); } @Override @@ -118,7 +118,7 @@ if (either.isA()) { //error } - System.out.println("end"); + // System.out.println("end"); } public JungleTree getTree(){ diff -r 96b9017b0e44 -r 6f9439ca3eb5 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 12:06:11 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/cr/ie/tatsuki/bbs/JuGrix.java Mon Oct 27 18:06:23 2014 +0900 @@ -94,7 +94,7 @@ for (;pairPersonIterator.hasNext();) { Pair pairPerson = pairPersonIterator.next(); - Iterator> pairIdIterator = personTraverser.find( + Iterator> pairIdIterator = personTraverser.findInSubTree( (TreeNode node) -> { String personId = node.getAttributes().getString("text"); if (personId == null) @@ -103,7 +103,7 @@ return true; return false; } - ,pairPerson.left()); + ,pairPerson.left(),"text",id); if (pairIdIterator.hasNext()) { String name = pairPerson.left().getAttributes().getString("id"); @@ -133,7 +133,7 @@ if (compareOrgId.equals(orgId)) return true; return false; - }); + },"id", orgId); if (!orgNodeIterator.hasNext()) return false; @@ -161,7 +161,7 @@ private boolean rdeFilter(String id, TreeNode targetNode) { InterfaceTraverser orgTraverser = organizationTree.getTraverser(); - Iterator> pairIdIterator = orgTraverser.find( + Iterator> pairIdIterator = orgTraverser.findInSubTree( (TreeNode node) -> { String element = node.getAttributes().getString("element"); if (element == null) @@ -173,7 +173,7 @@ return true; return false; } - ,targetNode); + ,targetNode,"element", "roleRefId"); TreeMap idMap = TreeMap.empty(Ord.stringOrd); for (; pairIdIterator.hasNext();) { @@ -201,10 +201,10 @@ return false; } ,"id",roleId); - + // -----------------------------------------bug------------------------------------------ for (;roleNodeIterator.hasNext();) { TreeNode roleNode = roleNodeIterator.next().left(); - Iterator> rdeNodeIterator = roleTraverser.find( + Iterator> rdeNodeIterator = roleTraverser.findInSubTree( (TreeNode node) -> { String elementName = node.getAttributes().getString("element"); if (elementName == null) @@ -220,7 +220,7 @@ return true; return false; } - ,roleNode); + ,roleNode,"text","id"); if (!rdeNodeIterator.hasNext()) return false; @@ -234,7 +234,7 @@ System.out.println(orgNode.getAttributes().getString("id")); InterfaceTraverser orgTraverser = organizationTree.getTraverser(); - Iterator> pairIdIterator = orgTraverser.find( + Iterator> pairIdIterator = orgTraverser.findInSubTree( (TreeNode node) -> { String elementName = node.getAttributes().getString("element"); if (elementName == null) @@ -248,7 +248,7 @@ return true; return false; } - ,orgNode); + ,orgNode,"text", id); if (pairIdIterator.hasNext()){ System.out.println(pairIdIterator.next().left().getAttributes().getString("text")); @@ -297,7 +297,7 @@ for (;searchTargetIterator.hasNext();) { Pair searchTargetPair = searchTargetIterator.next(); - Iterator> pairIdIterator = ifTraverser.find( + Iterator> pairIdIterator = ifTraverser.findInSubTree( (TreeNode node) -> { String nodeElement = node.getAttributes().getString("element"); if (nodeElement == null) @@ -309,7 +309,7 @@ return true; return false; } - ,searchTargetPair.left()); + ,searchTargetPair.left(),"element","roleRefId"); for (;pairIdIterator.hasNext();){ @@ -341,7 +341,7 @@ return new NullIterator(); TreeNode person = pairPersonIterator.next().left(); - Iterator> targetPairIterator = ifTraverser.find( + Iterator> targetPairIterator = ifTraverser.findInSubTree( (TreeNode node) -> { String nodeElement = node.getAttributes().getString("element"); if (nodeElement == null) @@ -355,7 +355,7 @@ return true; return false; } - ,person); + ,person,"text","0"); LinkedList idList = new LinkedList(); @@ -382,7 +382,7 @@ return new NullIterator(); TreeNode person = pairPersonIterator.next().left(); - Iterator> targetPairIterator = ifTraverser.find( + Iterator> targetPairIterator = ifTraverser.findInSubTree( (TreeNode node) -> { String nodeElement = node.getAttributes().getString("element"); if (nodeElement == null) @@ -396,7 +396,7 @@ return true; return false; } - ,person); + ,person,"text","0"); LinkedList idList = new LinkedList(); @@ -496,15 +496,14 @@ if (nodeId.equals(orgId)) return true; return false; - } - ,"element","Organization"); + },"id", orgId); if (!pairPersonIterator.hasNext()) return new NullIterator(); TreeNode person = pairPersonIterator.next().left(); - Iterator> chilrenOrgIdsIterator = orgTraverser.find( + Iterator> chilrenOrgIdsIterator = orgTraverser.findInSubTree( (TreeNode node) -> { String nodeElement = node.getAttributes().getString("element"); if (nodeElement == null) @@ -513,14 +512,14 @@ return true; return false; } - ,person); + ,person,"element","childOrganizations"); if (!chilrenOrgIdsIterator.hasNext()) return new NullIterator(); TreeNode chilerenOrgIds = chilrenOrgIdsIterator.next().left(); - Iterator> chilrenOrgIdIterator = orgTraverser.find( + Iterator> chilrenOrgIdIterator = orgTraverser.findInSubTree( (TreeNode node) -> { String nodeElement = node.getAttributes().getString("element"); if (nodeElement == null) @@ -532,7 +531,7 @@ return true; return false; } - ,chilerenOrgIds); + ,chilerenOrgIds, "element", "organizationRefIds"); LinkedList ids = new LinkedList(); @@ -594,14 +593,14 @@ if (nodeId.equals(personId)) return true; return false; - }); + },"id",personId); if (!personIterator.hasNext()) return ""; TreeNode targetNode = personIterator.next().left(); - Iterator> priorityIterator = personTraverser.find( + Iterator> priorityIterator = personTraverser.findInSubTree( (TreeNode node) -> { String element = node.getAttributes().getString("element"); if (element == null) @@ -614,7 +613,7 @@ if (compareRoleId.equals(roleId)) return true; return false; - },targetNode); + },targetNode,"element","roleRefId"); for (;priorityIterator.hasNext();) { Pair priorityPair = priorityIterator.next(); @@ -647,14 +646,14 @@ if (nodeId.equals(orgId)) return true; return false; - }); + },"element","Organization"); if (!orgIterator.hasNext()) return new LinkedList(); TreeNode orgNode = orgIterator.next().left(); - Iterator> parentOrgIterator = orgTraverser.find( + Iterator> parentOrgIterator = orgTraverser.findInSubTree( (TreeNode node) -> { String element = node.getAttributes().getString("element"); if (element == null) @@ -662,14 +661,14 @@ if (element.equals("parentOrganizations")) return true; return false; - }, orgNode); + }, orgNode,"element", "parentOrganizations"); LinkedList parentIds = new LinkedList(); for (;parentOrgIterator.hasNext();) { TreeNode parentOrgNode = parentOrgIterator.next().left(); - Iterator> parentNodeIterator = orgTraverser.find( + Iterator> parentNodeIterator = orgTraverser.findInSubTree( (TreeNode node) -> { String element = node.getAttributes().getString("element"); if (element == null) @@ -680,7 +679,7 @@ if (parentId != null) return true; return false; - }, parentOrgNode); + }, parentOrgNode,"element","organizationRefId"); for (;parentNodeIterator.hasNext();) { String parentId = parentNodeIterator.next().left().getAttributes().getString("text"); @@ -758,7 +757,7 @@ if (pathString.equals(StrPath)) return true; return false; - }); + }, "text","StrPath"); if (!idIterator.hasNext()) return ""; @@ -812,14 +811,14 @@ if (id.equals(roleId)) return true; return false; - }); + },"id",roleId); if (!roleIterator.hasNext()) return ""; TreeNode roleNode = roleIterator.next().left(); - Iterator> rdeIterator = traverser.find( + Iterator> rdeIterator = traverser.findInSubTree( (TreeNode node) -> { String element = node.getAttributes().getString("element"); if (element == null) @@ -830,7 +829,7 @@ if (rde != null) return true; return false; - },roleNode); + },roleNode,"element","roleDescriptionElementRefIds"); if (!rdeIterator.hasNext()) return ""; diff -r 96b9017b0e44 -r 6f9439ca3eb5 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/ReadXmlTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/ReadXmlTest.java Mon Oct 27 18:06:23 2014 +0900 @@ -0,0 +1,18 @@ +package jp.ac.u_ryukyu.cr.ie.tatsuki.xmlReadTest; + + + +import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; + +import org.junit.Test; + +public class ReadXmlTest { + + @Test + public void Readml(){ + long t1 = System.currentTimeMillis(); + JuGrix jugrix = new JuGrix(); + long t2 = System.currentTimeMillis(); + System.out.println(t2 - t1 + "s"); + } +} diff -r 96b9017b0e44 -r 6f9439ca3eb5 src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/SaxTest.java --- a/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/SaxTest.java Mon Oct 27 12:06:11 2014 +0900 +++ b/src/test/java/jp/ac/u_ryukyu/cr/ie/tatsuki/xmlReadTest/SaxTest.java Mon Oct 27 18:06:23 2014 +0900 @@ -25,7 +25,7 @@ Jungle jungle = new DefaultJungle(null, "hoge",new DefaultTreeEditor(new DefaultTraverser())); JungleTree tree = jungle.createNewTree("XMLTEST"); TestHandler testHandler = new TestHandler(tree); - saxParser.parse(new FileInputStream("/Users/e115731/workspace/aaa/xml/sample.xml"), testHandler); + saxParser.parse(new FileInputStream("xml/sample.xml"), testHandler); JungleTree newTree = testHandler.getTree(); InterfaceTraverser ifTraverser = newTree.getTraverser();