svn commit: r553574 - in /lucene/solr/trunk: client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java

[ry...@apache.org]

Author: ryan
Date: Thu Jul  5 10:36:38 2007
New Revision: 553574

URL: http://svn.apache.org/viewvc?view=rev&rev=553574
Log:
fixing multiple document adding error.
setting: addCmd.indexedId = null; before each add

Modified:
    lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
    lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java

Modified: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java?view=diff&rev=553574&r1=553573&r2=553574
==============================================================================
--- lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java (original)
+++ lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExampleTestBase.java Thu Jul  5 10:36:38 2007
@@ -21,10 +21,12 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import junit.framework.Assert;
 
+import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.UpdateResponse;
 import org.apache.solr.client.solrj.util.ClientUtils;
@@ -151,6 +153,61 @@
     Assert.assertEquals(0, response.getStatus());
     Assert.assertEquals(2, response.getResults().getNumFound() );
     Assert.assertFalse(query.getFilterQueries() == query2.getFilterQueries());
+  }
+  
+
+  /**
+   * query the example
+   */
+  public void testAddRetrieve() throws Exception
+  {    
+    String path = "/update";
+    
+    SolrServer server = getSolrServer();
+    
+    // Empty the database...
+    server.deleteByQuery( "*:*" );// delete everything!
+    
+    // Now add something...
+    SolrInputDocument doc1 = new SolrInputDocument();
+    doc1.addField( "id", "id1", 1.0f );
+    doc1.addField( "name", "doc1", 1.0f );
+    doc1.addField( "price", 10 );
+
+    SolrInputDocument doc2 = new SolrInputDocument();
+    doc2.addField( "id", "id2", 1.0f );
+    doc2.addField( "name", "doc2", 1.0f );
+    doc2.addField( "price", 20 );
+    
+    Collection<SolrInputDocument> docs = new ArrayList<SolrInputDocument>();
+    docs.add( doc1 );
+    docs.add( doc2 );
+    
+    // Add the documents
+    UpdateRequest up = new UpdateRequest();
+    up.setPath( path );
+    up.add( docs );
+    server.request( up );
+    server.commit();
+    
+    SolrQuery query = new SolrQuery();
+    query.setQuery( "*:*" );
+    query.addSortField( "price", SolrQuery.ORDER.asc );
+    QueryResponse rsp = server.query( query );
+    
+    Assert.assertEquals( path, 2, rsp.getResults().getNumFound() );
+    System.out.println( rsp.getResults() );
+    
+    // Now do it again
+    up = new UpdateRequest();
+    up.setPath( path );
+    up.add( docs );
+    server.request( up );
+    server.commit();
+    
+    rsp = server.query( query );
+    Assert.assertEquals( path, 2, rsp.getResults().getNumFound() );
+    System.out.println( rsp.getResults() );
   }
   
   protected void assertNumFound( String query, int num ) throws SolrServerException, IOException

Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java?view=diff&rev=553574&r1=553573&r2=553574
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java Thu Jul  5 10:36:38 2007
@@ -197,6 +197,7 @@
           } 
           else if ("doc".equals(currTag)) {
             log.finest("adding doc...");
+            addCmd.indexedId = null;
             SolrInputDocument doc = readDoc( parser );
             processor.processAdd( addCmd, doc );
           }