0
@@ -20,16 +20,16 @@ module AwsSdb
0
     
0
     def list_domains(max = nil, token = nil)
0
       params = { 'Action' => 'ListDomains' }
0
-      params['MoreToken'] = 
0
+      params['NextToken'] = 
0
         token unless token.nil? || token.empty?
0
-      params['MaxResults'] = 
0
+      params['MaxNumberOfDomains'] = 
0
         max.to_s unless max.nil? || max.to_i == 0
0
       doc = call(:get, params)
0
       results = []
0
       REXML::XPath.each(doc, '//DomainName/text()') do |domain| 
0
         results << domain.to_s
0
       end
0
-      return results, REXML::XPath.each(doc, '/MoreToken/text()').to_s 
0
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s 
0
     end
0
         
0
     def create_domain(domain)
0
@@ -45,23 +45,22 @@ module AwsSdb
0
       nil
0
     end  
0
     
0
-    def query(domain, query, sort = nil, max = nil, token = nil)
0
+    def query(domain, query, max = nil, token = nil)
0
       params = { 
0
         'Action' => 'Query', 
0
         'QueryExpression' => query,
0
         'DomainName' => domain.to_s 
0
       }
0
-      params['Sort'] = sort unless sort.nil? || sort.empty?
0
-      params['MoreToken'] = 
0
+      params['NextToken'] = 
0
         token unless token.nil? || token.empty?
0
-      params['MaxResults'] = 
0
-        max.to_s unless max.nil? || max.to_i != 0
0
+      params['MaxNumberOfItems'] = 
0
+        max.to_s unless max.nil? || max.to_i == 0
0
       doc = call(:get, params)
0
       results = []
0
       REXML::XPath.each(doc, '//ItemName/text()') do |item| 
0
         results << item.to_s
0
       end
0
-      return results, REXML::XPath.each(doc, '/MoreToken/text()').to_s 
0
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s 
0
     end
0
     
0
     def put_attributes(domain, item, attributes, replace = true)
0
@@ -136,9 +135,10 @@ module AwsSdb
0
       query = query.join('&')
0
       url = "http://sds.amazonaws.com?#{query}"
0
       uri = URI.parse(url)
0
+      @logger.debug("#{url}") if @logger
0
       response = 
0
         Net::HTTP.new(uri.host, uri.port).send_request(method, url)
0
-      @logger.debug("#{url} #{response.code} #{response.body}")
0
+      @logger.debug("#{response.code}\n#{response.body}") if @logger
0
       raise(ConnectionError.new(response)) unless (200..400).include?(
0
         response.code.to_i
0
       )