You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by eh...@apache.org on 2007/03/20 16:42:39 UTC
svn commit: r520437 - in /lucene/solr/trunk/client/ruby/solr-ruby: Rakefile
lib/solr/connection.rb lib/solr/request/commit.rb test/unit/request_test.rb
Author: ehatcher
Date: Tue Mar 20 08:42:38 2007
New Revision: 520437
URL: http://svn.apache.org/viewvc?view=rev&rev=520437
Log:
Add waitSearcher/waitFlush options to commit request.
Also bumped solr-ruby version to 0.0.2 for the future development.
Modified:
lucene/solr/trunk/client/ruby/solr-ruby/Rakefile
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/connection.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/commit.rb
lucene/solr/trunk/client/ruby/solr-ruby/test/unit/request_test.rb
Modified: lucene/solr/trunk/client/ruby/solr-ruby/Rakefile
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/Rakefile?view=diff&rev=520437&r1=520436&r2=520437
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/Rakefile (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/Rakefile Tue Mar 20 08:42:38 2007
@@ -29,7 +29,7 @@
#
# rake SOLR_CONSOLE=true
-SOLR_RUBY_VERSION = '0.0.1'
+SOLR_RUBY_VERSION = '0.0.2'
require 'rubygems'
require 'rake'
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/connection.rb
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/connection.rb?view=diff&rev=520437&r1=520436&r2=520437
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/connection.rb (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/connection.rb Tue Mar 20 08:42:38 2007
@@ -89,8 +89,8 @@
end
# sends a commit message to the server
- def commit
- response = send(Solr::Request::Commit.new)
+ def commit(options={})
+ response = send(Solr::Request::Commit.new(options))
return response.ok?
end
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/commit.rb
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/commit.rb?view=diff&rev=520437&r1=520436&r2=520437
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/commit.rb (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/commit.rb Tue Mar 20 08:42:38 2007
@@ -14,8 +14,18 @@
class Solr::Request::Commit < Solr::Request::Update
+ def initialize(options={})
+ @wait_searcher = options[:wait_searcher] || true
+ @wait_flush = options[:wait_flush] || true
+ end
+
+
def to_s
- Solr::XML::Element.new('commit').to_s
+ e = Solr::XML::Element.new('commit')
+ e.attributes['waitSearcher'] = @wait_searcher ? 'true' : 'false'
+ e.attributes['waitFlush'] = @wait_flush ? 'true' : 'false'
+
+ e.to_s
end
end
Modified: lucene/solr/trunk/client/ruby/solr-ruby/test/unit/request_test.rb
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/test/unit/request_test.rb?view=diff&rev=520437&r1=520436&r2=520437
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/test/unit/request_test.rb (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/test/unit/request_test.rb Tue Mar 20 08:42:38 2007
@@ -22,7 +22,7 @@
request = Solr::Request::Commit.new
assert_equal :xml, request.response_format
assert_equal 'update', request.handler
- assert_equal '<commit/>', request.to_s
+ assert_equal '<commit waitSearcher="true" waitFlush="true"/>', request.to_s
end
def test_add_doc_request