dor-services 4.14.3 → 4.14.4

data/lib/dor/models/describable.rb

@@ -89,9 +89,9 @@ module Dor
         new_lic =  doc.create_element("accessCondition", new_text, :type => 'license')
         doc.root.element_children.last.add_next_sibling new_lic
       end
-      rights.xpath("//use/machine[#{ci_compare('type', 'opendata')}]").each do |lic_type|
+      rights.xpath("//use/machine[#{ci_compare('type', 'opendatacommons')}]").each do |lic_type|
         next if lic_type.text =~ /none/i
-        lic_text = rights.at_xpath("//use/human[#{ci_compare('type', 'opendata')}]").text.strip
+        lic_text = rights.at_xpath("//use/human[#{ci_compare('type', 'opendatacommons')}]").text.strip
         next if lic_text.empty?
         new_text = "ODC #{lic_type.text}: #{lic_text}"
         new_lic =  doc.create_element("accessCondition", new_text, :type => 'license')

data/lib/dor/models/governable.rb

@@ -28,10 +28,7 @@ module Dor
 
     def reset_to_apo_default()
       rights_metadata_ds = self.rightsMetadata
-      #get the apo for this object
-      apo_druid=obj.identityMetadata.adminPolicy.first
-      apo_obj=Dor::Item.find(apo_druid, :lightweight => true)
-      rights_metadata_ds.content=apo_obj.rightsMetadata.ng_xml
+      rights_metadata_ds.content = admin_policy_object.rightsMetadata.ng_xml
     end
 
     def set_read_rights(rights)

data/lib/dor/services/registration_service.rb

@@ -73,7 +73,6 @@ module Dor
         idmd.add_value(:objectCreator, 'DOR')
         idmd.add_value(:objectLabel, label)
         idmd.add_value(:objectType, object_type)
-        idmd.add_value(:adminPolicy, admin_policy)
         other_ids.each_pair { |name,value| idmd.add_otherId("#{name}:#{value}") }
         tags.each { |tag| idmd.add_value(:tag, tag) }
         new_item.admin_policy_object = apo_object

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.14.3'
+  VERSION = '4.14.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.14.3
+  version: 4.14.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora