Author: koji
Date: Sun Feb 8 14:32:13 2009
New Revision: 742106
URL: http://svn.apache.org/viewvc?rev=742106&view=rev
Log:
SOLR-976: deleteByQuery is ignored when deleteById is placed prior to
deleteByQuery in a <delete>
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java
Modified: lucene/solr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=742106&r1=742105&r2=742106&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Sun Feb 8 14:32:13 2009
@@ -247,6 +247,13 @@
28. SOLR-1008: Fix stats.jsp XML encoding for <stat> item entries with
ampersands in their names. (ehatcher)
+29. SOLR-976: deleteByQuery is ignored when deleteById is placed prior to
deleteByQuery in a <delete>.
+ Now both delete by id and delete by query can be specified at the same
time as follows. (koji)
+ <delete>
+ <id>05991</id><id>06000</id>
+ <query>office:Bridgewater</query><query>office:Osaka</query>
+ </delete>
+
Other Changes
----------------------
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java?rev=742106&r1=742105&r2=742106&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java Sun Feb
8 14:32:13 2009
@@ -231,6 +231,8 @@
"unexpected XML tag /delete/" + currTag);
}
processor.processDelete(deleteCmd);
+ deleteCmd.id = null;
+ deleteCmd.query = null;
break;
// Add everything to the text
