Searching again works over REST, including full content-type translation.

The format management is a bit clunky right now, though, so I
need to fix how they're managed.  Some of these tests fail,
but 99% of the remaining work is in other classes so I wanted
this as a discrete commit.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb
index 1a21bfea9..0069933bd 100644
--- a/lib/puppet/network/http/handler.rb
+++ b/lib/puppet/network/http/handler.rb
@@ -81,13 +81,13 @@ module Puppet::Network::HTTP::Handler
     # Execute our search.
     def do_search(request, response)
         args = params(request)
-        result = model.search(args).collect {|result| result.to_yaml }.to_yaml
+        result = model.search(args)
 
         # LAK:FAIL This doesn't work.
         format = format_to_use(request)
         set_content_type(response, format)
 
-        set_response(response, result) 
+        set_response(response, model.render_multiple(format, result))
     end
 
     # Execute our destroy.