client.rb in calais-0.0.9

- old
+ new

@@ -4,11 +4,11 @@
     attr_accessor :content
     attr_accessor :license_id
 
     # processing directives
     attr_accessor :content_type, :output_format, :reltag_base_url, :calculate_relevance, :omit_outputting_original_text
-    attr_accessor :metadata_enables, :metadata_discards
+    attr_accessor :store_rdf, :metadata_enables, :metadata_discards
 
     # user directives
     attr_accessor :allow_distribution, :allow_search, :external_id, :submitter
 
     attr_accessor :external_metadata
@@ -45,13 +45,15 @@
       params_node['xmlns:rdf'] = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
       
       processing_node = Nokogiri::XML::Node.new('c:processingDirectives', document)
       processing_node['c:contentType'] = AVAILABLE_CONTENT_TYPES[@content_type] if @content_type
       processing_node['c:outputFormat'] = AVAILABLE_OUTPUT_FORMATS[@output_format] if @output_format
+      processing_node['c:calculateRelevanceScore'] = 'false' if @calculate_relevance == false
       processing_node['c:reltagBaseURL'] = @reltag_base_url.to_s if @reltag_base_url
       
-      processing_node['c:enableMetadataType'] = @metadata_enables.join(';') unless @metadata_enables.empty?
+      processing_node['c:enableMetadataType'] = @metadata_enables.join(',') unless @metadata_enables.empty?
+      processing_node['c:docRDFaccessible'] = @store_rdf if @store_rdf
       processing_node['c:discardMetadata'] = @metadata_discards.join(';') unless @metadata_discards.empty?
       processing_node['c:omitOutputtingOriginalText'] = 'true' if @omit_outputting_original_text
       
       user_node = Nokogiri::XML::Node.new('c:userDirectives', document)
       user_node['c:allowDistribution'] = @allow_distribution.to_s unless @allow_distribution.nil?
@@ -82,23 +84,23 @@
         raise 'missing license id' if @license_id.nil? || @license_id.empty?
 
         raise 'unknown content type' unless AVAILABLE_CONTENT_TYPES.keys.include?(@content_type) if @content_type
         raise 'unknown output format' unless AVAILABLE_OUTPUT_FORMATS.keys.include?(@output_format) if @output_format
 
-        %w[calculate_relevance allow_distribution allow_search].each do |variable|
+        %w[calculate_relevance store_rdf allow_distribution allow_search].each do |variable|
           value = self.send(variable)
           unless NilClass === value || TrueClass === value || FalseClass === value
             raise "expected a boolean value for #{variable} but got #{value}"
           end
         end
 
         @metadata_enables ||= []
         unknown_enables = Set.new(@metadata_enables) - KNOWN_ENABLES
-        raise "unknown metadata enables: #{unknown_enables.to_ainspect}" unless unknown_enables.empty?
+        raise "unknown metadata enables: #{unknown_enables.to_a.inspect}" unless unknown_enables.empty?
 
         @metadata_discards ||= []
         unknown_discards = Set.new(@metadata_discards) - KNOWN_DISCARDS
-        raise "unknown metadata discards: #{unknown_discards.to_ainspect}" unless unknown_discards.empty?
+        raise "unknown metadata discards: #{unknown_discards.to_a.inspect}" unless unknown_discards.empty?
       end
 
       def do_request(post_fields)
         unless @client.http_post(post_fields)
           raise 'unable to post to api endpoint'
\ No newline at end of file