index use_license_machine from rightsMetadata and default_use_license…

…_machine from defaultObjectRights
sul-dlss-deprecated · Dec 14, 2015 · a418132 · a418132
1 parent 5ac98df
commit a418132
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 113 deletions.
diff --git a/lib/dor/datastreams/rights_metadata_ds.rb b/lib/dor/datastreams/rights_metadata_ds.rb
@@ -119,8 +119,16 @@ def to_solr(solr_doc = {}, *args)
       %w(use_statement_ssim copyright_ssim).each do |key|
         solr_doc[key] = solr_doc[key].reject { |val| val.nil? || val == '' }.flatten unless solr_doc[key].nil?
       end
+      add_solr_value(solr_doc, 'use_license_machine', use_license, :string, [:stored_sortable])
+
       solr_doc
     end
 
+    def use_license
+      return creative_commons unless ['', nil].include?(creative_commons)
+      return open_data_commons unless ['', nil].include?(open_data_commons)
+      ''
+    end
+
   end # class
 end
diff --git a/lib/dor/models/editable.rb b/lib/dor/models/editable.rb
@@ -49,7 +49,7 @@ def to_solr(solr_doc = {}, *args)
       super(solr_doc, *args)
       add_solr_value(solr_doc, 'default_rights', default_rights, :string, [:symbol])
       add_solr_value(solr_doc, 'agreement', agreement, :string, [:symbol]) if agreement_object
-      add_solr_value(solr_doc, 'use_license_machine', use_license, :string, [:stored_sortable])
+      add_solr_value(solr_doc, 'default_use_license_machine', use_license, :string, [:stored_sortable])
       solr_doc
     end