You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ad...@apache.org on 2011/04/27 04:49:18 UTC
svn commit: r1096983 - in /lucene/dev: branches/branch_3x/lucene/contrib/
branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/
branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryPar...
Author: adrianocrestani
Date: Wed Apr 27 02:49:17 2011
New Revision: 1096983
URL: http://svn.apache.org/viewvc?rev=1096983&view=rev
Log:
LUCENE-3045: QueryNodeImpl.containsTag(String) should lowercase the tag key
Modified:
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java
lucene/dev/branches/lucene_solr_3_1/lucene/contrib/CHANGES.txt
lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java
lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java
lucene/dev/trunk/lucene/contrib/CHANGES.txt
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java
Modified: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt?rev=1096983&r1=1096982&r2=1096983&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt Wed Apr 27 02:49:17 2011
@@ -4,6 +4,9 @@ Lucene contrib change Log
Bug Fixes
+ * LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
+ not lowercasing the key before checking for the tag (Adriano Crestani)
+
* LUCENE-3026: SmartChineseAnalyzer's WordTokenFilter threw NullPointerException
on sentences longer than 32,767 characters. (wangzhenghang via Robert Muir)
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java?rev=1096983&r1=1096982&r2=1096983&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java Wed Apr 27 02:49:17 2011
@@ -189,7 +189,7 @@ public abstract class QueryNodeImpl impl
/** verify if a node contains a tag */
public boolean containsTag(String tagName) {
- return this.tags.containsKey(tagName);
+ return this.tags.containsKey(tagName.toLowerCase());
}
/**
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java?rev=1096983&r1=1096982&r2=1096983&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java Wed Apr 27 02:49:17 2011
@@ -32,4 +32,16 @@ public class TestQueryNode extends Lucen
bq.add(Arrays.asList(new QueryNode[] { nodeB }));
assertEquals(2, bq.getChildren().size());
}
+
+ /* LUCENE-3045 bug in QueryNodeImpl.containsTag(String key)*/
+ public void testTags() throws Exception {
+ QueryNode node = new FieldQueryNode("foo", "A", 0, 1);
+
+ node.setTag("TaG", new Object());
+ assertTrue(node.getTagMap().size() > 0);
+ assertTrue(node.containsTag("tAg"));
+ assertTrue(node.getTag("tAg") != null);
+
+ }
+
}
Modified: lucene/dev/branches/lucene_solr_3_1/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/CHANGES.txt?rev=1096983&r1=1096982&r2=1096983&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_3_1/lucene/contrib/CHANGES.txt Wed Apr 27 02:49:17 2011
@@ -1,5 +1,12 @@
Lucene contrib change Log
+======================= Lucene 3.1.x (not yet released) =======================
+
+Bug fixes
+
+ * LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
+ not lowercasing the key before checking for the tag (Adriano Crestani)
+
======================= Lucene 3.1.0 =======================
Changes in backwards compatibility policy
Modified: lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java?rev=1096983&r1=1096982&r2=1096983&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java (original)
+++ lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java Wed Apr 27 02:49:17 2011
@@ -189,7 +189,7 @@ public abstract class QueryNodeImpl impl
/** verify if a node contains a tag */
public boolean containsTag(String tagName) {
- return this.tags.containsKey(tagName);
+ return this.tags.containsKey(tagName.toLowerCase());
}
/**
Modified: lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java?rev=1096983&r1=1096982&r2=1096983&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java (original)
+++ lucene/dev/branches/lucene_solr_3_1/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java Wed Apr 27 02:49:17 2011
@@ -32,4 +32,16 @@ public class TestQueryNode extends Lucen
bq.add(Arrays.asList(new QueryNode[] { nodeB }));
assertEquals(2, bq.getChildren().size());
}
+
+ /* LUCENE-3045 bug in QueryNodeImpl.containsTag(String key)*/
+ public void testTags() throws Exception {
+ QueryNode node = new FieldQueryNode("foo", "A", 0, 1);
+
+ node.setTag("TaG", new Object());
+ assertTrue(node.getTagMap().size() > 0);
+ assertTrue(node.containsTag("tAg"));
+ assertTrue(node.getTag("tAg") != null);
+
+ }
+
}
Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=1096983&r1=1096982&r2=1096983&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Wed Apr 27 02:49:17 2011
@@ -42,11 +42,19 @@ API Changes
Instead, use SimilarityProvider to return different SweetSpotSimilaritys
for different fields, this way all parameters (such as TF factors) can be
customized on a per-field basis. (Robert Muir)
+
+Bug Fixes
+
+ * LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
+ not lowercasing the key before checking for the tag (Adriano Crestani)
======================= Lucene 3.x (not yet released) =======================
Bug Fixes
+ * LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
+ not lowercasing the key before checking for the tag (Adriano Crestani)
+
* LUCENE-3026: SmartChineseAnalyzer's WordTokenFilter threw NullPointerException
on sentences longer than 32,767 characters. (wangzhenghang via Robert Muir)
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java?rev=1096983&r1=1096982&r2=1096983&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/QueryNodeImpl.java Wed Apr 27 02:49:17 2011
@@ -160,7 +160,7 @@ public abstract class QueryNodeImpl impl
/** verify if a node contains a tag */
public boolean containsTag(String tagName) {
- return this.tags.containsKey(tagName);
+ return this.tags.containsKey(tagName.toLowerCase());
}
public Object getTag(String tagName) {
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java?rev=1096983&r1=1096982&r2=1096983&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/core/nodes/TestQueryNode.java Wed Apr 27 02:49:17 2011
@@ -32,4 +32,16 @@ public class TestQueryNode extends Lucen
bq.add(Arrays.asList(nodeB));
assertEquals(2, bq.getChildren().size());
}
+
+ /* LUCENE-3045 bug in QueryNodeImpl.containsTag(String key)*/
+ public void testTags() throws Exception {
+ QueryNode node = new FieldQueryNode("foo", "A", 0, 1);
+
+ node.setTag("TaG", new Object());
+ assertTrue(node.getTagMap().size() > 0);
+ assertTrue(node.containsTag("tAg"));
+ assertTrue(node.getTag("tAg") != null);
+
+ }
+
}