Author: ehatcher
Date: Thu Aug 23 05:17:29 2007
New Revision: 568955
URL: http://svn.apache.org/viewvc?rev=568955&view=rev
Log:
fix mlt.fl
Modified:
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/modify_document.rb
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/standard.rb
lucene/solr/trunk/client/ruby/solr-ruby/test/unit/modify_document_test.rb
lucene/solr/trunk/client/ruby/solr-ruby/test/unit/standard_request_test.rb
Modified:
lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/modify_document.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/modify_document.rb?rev=568955&r1=568954&r2=568955&view=diff
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/modify_document.rb
(original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/modify_document.rb
Thu Aug 23 05:17:29 2007
@@ -26,7 +26,7 @@
if field_data
field_data.each do |field_name, field_value|
modes << "#{field_name}:#{mode.to_s.upcase}"
- @doc[field_name] = field_value
+ @doc[field_name] = field_value if field_value # if value is nil,
omit so it can be removed
end
update_data.delete mode
end
Modified: lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/standard.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/standard.rb?rev=568955&r1=568954&r2=568955&view=diff
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/standard.rb
(original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/lib/solr/request/standard.rb Thu
Aug 23 05:17:29 2007
@@ -104,7 +104,7 @@
if @params[:mlt]
hash[:mlt] = true
hash["mlt.count"] = @params[:mlt][:count]
- hash["mlt.fl"] = @params[:mlt][:field_list]
+ hash["mlt.fl"] = @params[:mlt][:field_list].join(',')
hash["mlt.mintf"] = @params[:mlt][:min_term_freq]
hash["mlt.mindf"] = @params[:mlt][:min_doc_freq]
hash["mlt.minwl"] = @params[:mlt][:min_word_length]
Modified:
lucene/solr/trunk/client/ruby/solr-ruby/test/unit/modify_document_test.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/test/unit/modify_document_test.rb?rev=568955&r1=568954&r2=568955&view=diff
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/test/unit/modify_document_test.rb
(original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/test/unit/modify_document_test.rb
Thu Aug 23 05:17:29 2007
@@ -16,9 +16,9 @@
class ModifyDocumentTest < Test::Unit::TestCase
def test_update_formatting
- request = Solr::Request::ModifyDocument.new(:id => 10, :overwrite =>
{:name => ['val1', 'val2']})
+ request = Solr::Request::ModifyDocument.new(:id => 10, :overwrite =>
{:name => ['val1', 'val2'], :copyfield => nil})
assert_equal :xml, request.response_format
- assert_equal 'update?mode=name:OVERWRITE', request.handler
+ assert_equal 'update?mode=copyfield:OVERWRITE,name:OVERWRITE',
request.handler
assert_match(/<add>[\s]*<doc>[\s]*<field
name=["']id['"]>10<\/field>[\s]*<field
name=['"]name['"]>val1<\/field>[\s]*<field
name=['"]name['"]>val2<\/field>[\s]*<\/doc>[\s]*<\/add>/, request.to_s)
end
Modified:
lucene/solr/trunk/client/ruby/solr-ruby/test/unit/standard_request_test.rb
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/test/unit/standard_request_test.rb?rev=568955&r1=568954&r2=568955&view=diff
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/test/unit/standard_request_test.rb
(original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/test/unit/standard_request_test.rb
Thu Aug 23 05:17:29 2007
@@ -132,7 +132,7 @@
hash = request.to_hash
assert_equal true, hash[:mlt]
assert_equal 5, hash["mlt.count"]
- assert_equal ['field1', 'field2'], hash["mlt.fl"]
+ assert_equal 'field1,field2', hash["mlt.fl"]
assert_equal 3, hash["mlt.mintf"]
assert_equal 10, hash["mlt.mindf"]
assert_equal 4, hash["mlt.minwl"]
