# HG changeset patch # User one # Date 1415294431 -32400 # Node ID 99bda30ea72c835ce14d23314866f7bcb3f97d68 # Parent ec166c8ff079c2a8e91c21076cf1f2d7d03309ed temporarily stored diff -r ec166c8ff079 -r 99bda30ea72c src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java Tue Oct 28 06:35:34 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/traverser/InterfaceTraverser.java Fri Nov 07 02:20:31 2014 +0900 @@ -66,22 +66,22 @@ TreeMap>> innerIndex = this.index.get(key).some(); - Option>> opList = innerIndex.get(searchValue); + Option>> opList = innerIndex.get(searchValue); - if (opList.isNone()) - return null;// 空のIteratorを返す + if (opList.isNone()) + return null;// 空のIteratorを返す - List> list = opList.some(); - NodePath targetNodePath = subTree.right(); - List> filteredList = List.nil(); - for (Pair pair : list) { - NodePath compareNodePath = pair.right(); - if (targetNodePath.compare(compareNodePath)) - filteredList = filteredList.cons(pair); - - } - - return filteredList.iterator(); + List> list = opList.some(); + NodePath targetNodePath = subTree.right(); + List> filteredList = List.nil(); + + for (Pair pair : list) { + NodePath compareNodePath = pair.right(); + if (targetNodePath.compare(compareNodePath)) + filteredList = filteredList.cons(pair); + } + + return filteredList.iterator(); } else { final PathNodeIterator itNode = new PathNodeIterator(subTree.left()); @@ -291,7 +291,6 @@ } } - public Iterator> findAll(Query query, String key) { if (index.get(key).isSome()) { diff -r ec166c8ff079 -r 99bda30ea72c src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/store/index/PutIndexEditor.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/store/index/PutIndexEditor.java Tue Oct 28 06:35:34 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/jungle/store/index/PutIndexEditor.java Fri Nov 07 02:20:31 2014 +0900 @@ -62,7 +62,7 @@ } else { TreeMap>> innerIndex = innerIndexOp.some(); - innerIndex.set(attribute, null); + Option>> opList = innerIndex.get(attribute); if (opList.isNone()) {