dor-services 4.25.1 → 5.0.0

data/lib/dor/migrations/identifiable/assert_adminPolicy.rb

@@ -6,4 +6,4 @@ Dor::Identifiable.on_upgrade '3.5.0', 'Assert hydra:isGovernedBy' do |obj|
   else
     false
   end
-end
+end

data/lib/dor/migrations/identifiable/fix_model_assertions.rb

@@ -4,7 +4,7 @@ Dor::Identifiable.on_upgrade '3.6.1', 'Assert correct models' do |obj|
     obj.remove_relationship :has_model, 'info:fedora/hydra:commonMetadata'
     applied = true
   end
-
+  
   unless obj.relationships.predicates.any? { |p| p.to_s == 'info:fedora/fedora-system:def/model#hasModel' }
     obj.assert_content_model
     applied = true

data/lib/dor/migrations/identifiable/record_remediation.rb

@@ -10,9 +10,9 @@ Dor::Identifiable.on_upgrade '3.6.1', 'Record Remediation Version' do |obj|
   else
     add_tag = true
   end
-
+  
   if add_tag
     obj.identityMetadata.add_value :tag, "Remediated By : #{Dor::VERSION}"
   end
   add_tag
-end
+end

data/lib/dor/migrations/identifiable/uriify_augmented_contentlocation_refs.rb

@@ -4,7 +4,7 @@ Dor::Identifiable.on_upgrade '3.14.8', 'Fix up invalid URIs in content-augmented
     false
   rescue URI::InvalidURIError
     true
-  rescue
+  rescue 
     false
   end
 

data/lib/dor/migrations/identifiable/uriify_contentlocation_refs.rb

@@ -4,7 +4,7 @@ Dor::Identifiable.on_upgrade '3.11.6', 'Fix up invalid URIs in objects' do |obj|
     false
   rescue URI::InvalidURIError
     true
-  rescue
+  rescue 
     false
   end
 

data/lib/dor/migrations/processable/unify_workflows.rb

@@ -5,11 +5,11 @@ Dor::Processable.on_upgrade '3.5.0', 'Replace individual *WF datastreams with un
     obj.workflows.content
     run = true
   end
-
+      
   # Remove individual *WF datastreams
-  obj.datastreams.each_pair do |dsid,ds|
-    if ds.controlGroup == 'E' && dsid =~ /WF$/
-      ds.delete
+  obj.datastreams.each_pair do |dsid,ds| 
+    if ds.controlGroup == 'E' and dsid =~ /WF$/
+      ds.delete 
       run = true
     end
   end

data/lib/dor/migrations/versionable/add_missing_version_md.rb

@@ -6,4 +6,4 @@ Dor::Versionable.on_upgrade '3.12.2', 'Add missing versionMetadata' do |obj|
     run = true
   end
   run
-end
+end

data/lib/dor/models/admin_policy_object.rb

@@ -13,4 +13,4 @@ module Dor
     has_metadata :name => "roleMetadata", :type => Dor::RoleMetadataDS, :label => 'Role Metadata'
     has_metadata :name => "defaultObjectRights", :type => Dor::DefaultObjectRightsDS, :label => 'Default Object Rights'
   end
-end
+end

data/lib/dor/models/assembleable.rb

@@ -1,12 +1,11 @@
 module Dor
   module Assembleable
-
-    def initialize_workspace(source = nil)
+    
+    def initialize_workspace(source=nil)
+      druid = DruidTools::Druid.new(self.pid, Config.stacks.local_workspace_root)
       if(source.nil?)
-        druid = DruidTools::Druid.new(pid,Config.stacks.local_workspace_root)
         druid.mkdir
       else
-        druid = DruidTools::Druid.new(pid, Config.stacks.local_workspace_root)
         druid.mkdir_with_final_link(source)
       end
     end

data/lib/dor/models/collection.rb

@@ -6,8 +6,6 @@ module Dor
     include Describable
     include Publishable
     include Versionable
-    include Discoverable
-    include Releaseable
 
     has_many :members, :property => :is_member_of_collection, :inbound => true, :class_name => "ActiveFedora::Base"
     has_object_type 'collection'

data/lib/dor/models/contentable.rb

@@ -3,17 +3,17 @@ module Dor
     extend ActiveSupport::Concern
 
     #add a file to a resource, not to be confused with add a resource to an object
-    def add_file file, resource, file_name, mime_type = nil,publish = 'no', shelve = 'no', preserve = 'no'
-      contentMD=datastreams['contentMetadata']
+    def add_file file, resource, file_name, mime_type=nil,publish='no', shelve='no', preserve='no'
+      contentMD=self.datastreams['contentMetadata']
       xml=contentMD.ng_xml
       #make sure the resource exists
       if xml.search('//resource[@id=\''+resource+'\']').length == 0
         raise 'resource doesnt exist.'
       end
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
-      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
       location=druid_tools.path(file_name)
-      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
       md5=Digest::MD5.file(file.path).hexdigest
       sha1=Digest::SHA1.file(file.path).hexdigest
       size=File.size?(file.path)
@@ -26,7 +26,7 @@ module Dor
           raise 'The file '+file_name+' already exists!'
         rescue Net::SFTP::StatusException
           sftp.upload!(file.path,location)
-          contentMetadata.add_file file_hash,resource
+          self.contentMetadata.add_file file_hash,resource
         end
       rescue Net::SFTP::StatusException
         #the directory layout doesnt match the new style, so use the old style.
@@ -36,7 +36,7 @@ module Dor
         rescue Net::SFTP::StatusException
           #the file doesnt already exist, which is good. Add it
           sftp.upload!(file.path,oldlocation)
-          contentMetadata.add_file file_hash,resource
+          self.contentMetadata.add_file file_hash,resource
         end
       end
       #can only arrive at this point if a non status exception occurred.
@@ -44,10 +44,10 @@ module Dor
 
     def replace_file file,file_name
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
-      item=Dor::Item.find(pid)
-      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
+      item=Dor::Item.find(self.pid)
+      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
       location=druid_tools.path(file_name)
-      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
 
       md5=Digest::MD5.file(file.path).hexdigest
       sha1=Digest::SHA1.file(file.path).hexdigest
@@ -66,7 +66,7 @@ module Dor
     end
 
     def get_preserved_file file, version
-      preservation_server=Config.content.sdr_server+'/sdr/objects/'+pid+"/content/"
+      preservation_server=Config.content.sdr_server+'/sdr/objects/'+self.pid+"/content/"
       file=URI.encode(file)
       add=preservation_server+file+"?version="+version
       uri = URI(add)
@@ -78,9 +78,9 @@ module Dor
     end
 
     def get_file file
-      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
       location=druid_tools.path(file)
-      oldlocation=location.gsub('/'+file,'').gsub('/'+pid.gsub('druid:',''),'')+'/'+file
+      oldlocation=location.gsub('/'+file,'').gsub('/'+self.pid.gsub('druid:',''),'')+'/'+file
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
       begin
         data=sftp.download!(location)
@@ -89,9 +89,9 @@ module Dor
       end
     end
     def remove_file filename
-      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
       location=druid_tools.path(filename)
-      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
       begin
         data=sftp.remove!(location)
@@ -102,37 +102,38 @@ module Dor
         rescue Net::SFTP::StatusException
         end
       end
-      contentMetadata.remove_file filename
+      self.contentMetadata.remove_file filename
     end
     def rename_file old_name, new_name
-      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
       location=druid_tools.path(old_name)
-      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
       begin
         data=sftp.rename!(location,location.gsub(old_name,new_name))
       rescue
         data=sftp.rename!(oldlocation,oldlocation.gsub(old_name,new_name))
       end
-      contentMetadata.rename_file(old_name, new_name)
+      self.contentMetadata.rename_file(old_name, new_name)
     end
     def remove_resource resource_name
       #run delete for all of the files in the resource
-      xml=contentMetadata.ng_xml
+      xml=self.contentMetadata.ng_xml
       files=xml.search('//resource[@id=\''+resource_name+'\']/file').each do |file|
-        remove_file(file['id'])
+        self.remove_file(file['id'])
       end
       #remove the resource record from the metadata and renumber the resource sequence
-      contentMetadata.remove_resource resource_name
+      self.contentMetadata.remove_resource resource_name
     end
+
     #list files in the workspace
     def list_files
       filename='none'
       files=[]
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
-      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
       location=druid_tools.path(filename).gsub(filename,'')
-      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
       begin
         sftp.dir.entries(location, "*") do |file|
           files<<file.name
@@ -146,7 +147,13 @@ module Dor
           return files
         end
       end
-      files
+      return files
+    end
+
+    # determine whether the file in question is present in the object's workspace.
+    def is_file_in_workspace? filename
+      druid_obj = DruidTools::Druid.new(self.pid, Dor::Config.stacks.local_workspace_root)
+      return druid_obj.find_content(filename) != nil
     end
 
     # Appends contentMetadata file resources from the source objects to this object
@@ -172,7 +179,7 @@ module Dor
             secondary_file['id'] = new_secondary_file_name(secondary_file['id'], max_sequence)
 
             if primary_cm.at_xpath("//file[@id = '#{secondary_file["id"]}']")
-              raise Dor::Exception.new "File '#{secondary_file['id']}' from secondary object #{src_pid} already exist in primary object: #{pid}"
+              raise Dor::Exception.new "File '#{secondary_file['id']}' from secondary object #{src_pid} already exist in primary object: #{self.pid}"
             end
           end
 
@@ -194,7 +201,7 @@ module Dor
           resource_copy.first_element_child.add_previous_sibling attr_node
         end
       end
-      contentMetadata.content_will_change!
+      self.contentMetadata.content_will_change!
     end
 
     def new_secondary_file_name old_name, sequence_num
@@ -222,13 +229,5 @@ module Dor
       rightsMetadata.content = '<rightsMetadata/>'
       add_tag "Decommissioned : #{tag}"
     end
-    
-    # Adds a RELS-EXT constituent relationship to the given druid
-    # @param [String] druid the parent druid of the constituent relationship
-    # e.g., 
-    #     <fedora:isConstituentOf rdf:resource="info:fedora/druid:hj097bm8879" />
-    def add_constituent(druid)
-      add_relationship :is_constituent_of, ActiveFedora::Base.find(druid)      
-    end
   end
-end
+end

data/lib/dor/models/describable.rb

@@ -3,20 +3,19 @@ module Dor
     extend ActiveSupport::Concern
 
     DESC_MD_FORMATS = {
-      'http://www.tei-c.org/ns/1.0' => 'tei',
-      'http://www.loc.gov/mods/v3'  => 'mods'
+      "http://www.tei-c.org/ns/1.0" => 'tei',
+      "http://www.loc.gov/mods/v3"  => 'mods'
     }
     class CrosswalkError < Exception; end
 
     included do
-      has_metadata :name => 'descMetadata', :type => Dor::DescMetadataDS, :label => 'Descriptive Metadata', :control_group => 'M'
+      has_metadata :name => "descMetadata", :type => Dor::DescMetadataDS, :label => 'Descriptive Metadata', :control_group => 'M'
     end
 
     def fetch_descMetadata_datastream
-      candidates = datastreams['identityMetadata'].otherId.collect { |oid| oid.to_s }
+      candidates = self.datastreams['identityMetadata'].otherId.collect { |oid| oid.to_s }
       metadata_id = Dor::MetadataService.resolvable(candidates).first
-      return nil if metadata_id.nil?
-      Dor::MetadataService.fetch(metadata_id.to_s)
+      return metadata_id.nil? ? nil : Dor::MetadataService.fetch(metadata_id.to_s)
     end
 
     def build_descMetadata_datastream(ds)
@@ -30,31 +29,29 @@ module Dor
     end
 
     # Generates Dublin Core from the MODS in the descMetadata datastream using the LoC mods2dc stylesheet
-    # Should NOT be used for the Fedora DC datastream
+    #    Should not be used for the Fedora DC datastream
     # @raise [Exception] Raises an Exception if the generated DC is empty or has no children
     def generate_dublin_core
-      format = metadata_format
+      format = self.metadata_format
       if format.nil?
         raise CrosswalkError, "Unknown descMetadata namespace: #{metadata_namespace.inspect}"
       end
       xslt = Nokogiri::XSLT(File.new(File.expand_path(File.dirname(__FILE__) + "/#{format}2dc.xslt")) )
-      desc_md = descMetadata.ng_xml.dup(1)
-      add_collection_reference(desc_md)
+      desc_md = self.descMetadata.ng_xml.dup(1)
+      self.add_collection_reference(desc_md)
       dc_doc = xslt.transform(desc_md)
       # Remove empty nodes
       dc_doc.xpath('/oai_dc:dc/*[count(text()) = 0]').remove
-      if dc_doc.root.nil? || dc_doc.root.children.size == 0
+      if(dc_doc.root.nil? || dc_doc.root.children.size == 0)
         raise CrosswalkError, "Dor::Item#generate_dublin_core produced incorrect xml:\n#{dc_doc.to_xml}"
       end
       dc_doc
     end
 
     def generate_public_desc_md
-      doc = descMetadata.ng_xml.dup(1)
+      doc = self.descMetadata.ng_xml.dup(1)
       add_collection_reference(doc)
       add_access_conditions(doc)
-      add_constituent_relations(doc)
-      doc.xpath('//comment()').remove
       new_doc = Nokogiri::XML(doc.to_xml) { |x| x.noblanks }
       new_doc.encoding = 'UTF-8'
       new_doc.to_xml
@@ -66,33 +63,31 @@ module Dor
     def add_access_conditions(doc)
       # clear out any existing accessConditions
       doc.xpath('//mods:accessCondition', 'mods' => 'http://www.loc.gov/mods/v3').each {|n| n.remove}
-      rights = datastreams['rightsMetadata'].ng_xml
+      rights = self.datastreams['rightsMetadata'].ng_xml
 
       rights.xpath('//use/human[@type="useAndReproduction"]').each do |use|
         txt = use.text.strip
         next if txt.empty?
-        new_use = doc.create_element('accessCondition', use.text.strip, :type => 'useAndReproduction')
-        doc.root.element_children.last.add_next_sibling new_use
+        doc.root.element_children.last.add_next_sibling doc.create_element("accessCondition", txt, :type => 'useAndReproduction')
       end
       rights.xpath('//copyright/human[@type="copyright"]').each do |cr|
         txt = cr.text.strip
         next if txt.empty?
-        new_use = doc.create_element('accessCondition', txt, :type => 'copyright')
-        doc.root.element_children.last.add_next_sibling new_use
+        doc.root.element_children.last.add_next_sibling doc.create_element("accessCondition", txt, :type => 'copyright')
       end
       rights.xpath("//use/machine[#{ci_compare('type', 'creativecommons')}]").each do |lic_type|
         next if lic_type.text =~ /none/i
         lic_text = rights.at_xpath("//use/human[#{ci_compare('type', 'creativecommons')}]").text.strip
         next if lic_text.empty?
-        new_lic = doc.create_element('accessCondition', "CC #{lic_type.text}: #{lic_text}", :type => 'license')
-        doc.root.element_children.last.add_next_sibling new_lic
+        new_text = "CC #{lic_type.text}: #{lic_text}"
+        doc.root.element_children.last.add_next_sibling doc.create_element("accessCondition", new_text, :type => 'license')
       end
       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', 'opendatacommons')}]").text.strip
         next if lic_text.empty?
-        new_lic = doc.create_element('accessCondition', "ODC #{lic_type.text}: #{lic_text}", :type => 'license')
-        doc.root.element_children.last.add_next_sibling new_lic
+        new_text = "ODC #{lic_type.text}: #{lic_text}"
+        doc.root.element_children.last.add_next_sibling doc.create_element("accessCondition", new_text, :type => 'license')
       end
     end
 
@@ -100,8 +95,8 @@ module Dor
     # @param [Nokogiri::XML::Document] doc A copy of the descriptiveMetadata of the object
     # @note this method modifies the passed in doc
     def add_collection_reference(doc)
-      return unless methods.include? :public_relationships
-      collections = public_relationships.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection',
+      return unless self.methods.include? :public_relationships
+      collections=self.public_relationships.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection',
                                        'fedora' => 'info:fedora/fedora-system:def/relations-external#',
                                        'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' )
       return if collections.empty?
@@ -112,153 +107,116 @@ module Dor
       end
 
       collections.each do |collection_node|
-        druid = collection_node['rdf:resource']
-        druid = druid.gsub('info:fedora/','')
-        collection_obj = Dor::Item.find(druid)
+        druid=collection_node['rdf:resource']
+        druid=druid.gsub('info:fedora/','')
+        collection_obj=Dor::Item.find(druid)
         collection_title = Dor::Describable.get_collection_title(collection_obj)
-        related_item_node = Nokogiri::XML::Node.new('relatedItem', doc)
-        related_item_node['type'] = 'host'
-        title_info_node = Nokogiri::XML::Node.new('titleInfo', doc)
-        title_node = Nokogiri::XML::Node.new('title', doc)
-        title_node.content = collection_title
+        related_item_node=Nokogiri::XML::Node.new('relatedItem',doc)
+        related_item_node['type']='host'
+        title_info_node=Nokogiri::XML::Node.new('titleInfo',doc)
+        title_node=Nokogiri::XML::Node.new('title',doc)
+        title_node.content=collection_title
 
-        # e.g., 
-        #   <location>
-        #     <url>http://purl.stanford.edu/rh056sr3313</url>
-        #   </location>
-        loc_node = doc.create_element('location')
-        url_node = doc.create_element('url')
-        url_node.content = "http://#{Dor::Config.stacks.document_cache_host}/#{druid.split(':').last}"
-        loc_node << url_node
+        id_node=Nokogiri::XML::Node.new('identifier',doc)
+        id_node['type'] = 'uri'
+        id_node.content = "http://#{Dor::Config.stacks.document_cache_host}/#{druid.split(':').last}"
 
-        type_node = Nokogiri::XML::Node.new('typeOfResource', doc)
+        type_node=Nokogiri::XML::Node.new('typeOfResource',doc)
         type_node['collection'] = 'yes'
         doc.root.add_child(related_item_node)
         related_item_node.add_child(title_info_node)
         title_info_node.add_child(title_node)
-        related_item_node.add_child(loc_node)
+        related_item_node.add_child(id_node)
         related_item_node.add_child(type_node)
       end
     end
-    
-    # expand constituent relations into relatedItem references -- see JUMBO-18
-    # @param [Nokogiri::XML] doc public MODS XML being built
-    def add_constituent_relations(doc)
-	    self.public_relationships.search('//rdf:RDF/rdf:Description/fedora:isConstituentOf',
-	                                     'fedora' => 'info:fedora/fedora-system:def/relations-external#',
-	                                     'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' ).each do |parent|
-        # fetch the parent object to get title
-        druid = parent['rdf:resource'].gsub(/^info:fedora\//, '')
-        parent_item = Dor::Item.find(druid)
-
-        # create the MODS relation
-        relatedItem = doc.create_element 'relatedItem'
-        relatedItem['type'] = 'host'
-        relatedItem['displayLabel'] = 'Appears in'
-        
-        # load the title from the parent's DC.title
-        titleInfo = doc.create_element 'titleInfo'
-        title = doc.create_element 'title'
-        title.content = parent_item.datastreams['DC'].title.first
-        titleInfo << title
-        relatedItem << titleInfo
-        
-        # point to the PURL for the parent
-        location = doc.create_element 'location'
-        url = doc.create_element 'url'
-        url.content = "http://#{Dor::Config.stacks.document_cache_host}/#{druid.split(':').last}"
-        location << url
-        relatedItem << location
-        
-        # finish up by adding relation to public MODS
-        doc.root << relatedItem
-      end
-    end
-    
     def metadata_namespace
-      desc_md = datastreams['descMetadata'].ng_xml
-      return nil if desc_md.nil? || desc_md.root.nil? || desc_md.root.namespace.nil?
-      desc_md.root.namespace.href
+      desc_md = self.datastreams['descMetadata'].ng_xml
+      if desc_md.nil? || desc_md.root.nil? || desc_md.root.namespace.nil?
+        return nil
+      else
+        return desc_md.root.namespace.href
+      end
     end
 
     def metadata_format
       DESC_MD_FORMATS[metadata_namespace]
     end
 
-    def to_solr(solr_doc = {}, *args)
+    def to_solr(solr_doc=Hash.new, *args)
       super solr_doc, *args
-      add_solr_value(solr_doc, 'metadata_format', metadata_format, :string, [:searchable, :facetable])
+      add_solr_value(solr_doc, "metadata_format", self.metadata_format, :string, [:symbol, :searchable, :facetable])
       begin
-        dc_doc = generate_dublin_core
+        dc_doc = self.generate_dublin_core
         dc_doc.xpath('/oai_dc:dc/*').each do |node|
-          add_solr_value(solr_doc, "public_dc_#{node.name}", node.text, :string, [:searchable])
+          add_solr_value(solr_doc, "public_dc_#{node.name}", node.text, :string, [:stored_searchable])
         end
-        creator = ''
+        creator=''
         dc_doc.xpath('//dc:creator').each do |node|
-          creator = node.text
+          creator=node.text
         end
-        title = ''
+        title=''
         dc_doc.xpath('//dc:title').each do |node|
-          title = node.text
+          title=node.text
         end
-        creator_title = creator+title
-        add_solr_value(solr_doc, 'creator_title', creator_title, :string, [:sortable])
+        creator_title=creator+title
+        add_solr_value(solr_doc, 'creator_title', creator_title , :string, [:sortable])
       rescue CrosswalkError => e
-        ActiveFedora.logger.warn "Cannot index #{pid}.descMetadata: #{e.message}"
+        ActiveFedora.logger.warn "Cannot index #{self.pid}.descMetadata: #{e.message}"
       end
       solr_doc
     end
-
     def update_title(new_title)
-      unless update_simple_field('mods:mods/mods:titleInfo/mods:title', new_title)
+      if not update_simple_field('mods:mods/mods:titleInfo/mods:title',new_title)
         raise 'Descriptive metadata has no title to update!'
       end
     end
-
     def add_identifier(type, value)
-      ds_xml = descMetadata.ng_xml
+      ds_xml=self.descMetadata.ng_xml
       ds_xml.search('//mods:mods','mods' => 'http://www.loc.gov/mods/v3').each do |node|
-        new_node = Nokogiri::XML::Node.new('identifier', ds_xml) # this ends up being mods:identifier without having to specify the namespace
-        new_node['type'] = type
-        new_node.content = value
+        new_node=Nokogiri::XML::Node.new('identifier',ds_xml) #this ends up being mods:identifier without having to specify the namespace
+        new_node['type']=type
+        new_node.content=value
         node.add_child(new_node)
       end
     end
-
-    def delete_identifier(type, value = nil)
-      descMetadata.ng_xml.search('//mods:identifier','mods' => 'http://www.loc.gov/mods/v3').each do |node|
+    def delete_identifier(type,value=nil)
+      ds_xml=self.descMetadata.ng_xml
+      ds_xml.search('//mods:identifier','mods' => 'http://www.loc.gov/mods/v3').each do |node|
         if node.content == value || value.nil?
           node.remove
           return true
         end
       end
-      false
+      return false
     end
 
-    def set_desc_metadata_using_label(force = false)
-      ds = descMetadata
+    def set_desc_metadata_using_label(force=false)
+      ds=self.descMetadata
       unless force || ds.new?
-        raise 'Cannot proceed, there is already content in the descriptive metadata datastream.' + ds.content.to_s
+        raise 'Cannot proceed, there is already content in the descriptive metadata datastream.'+ds.content.to_s
       end
-      label = self.label
+      label=self.label
       builder = Nokogiri::XML::Builder.new { |xml|
-        xml.mods( 'xmlns' => 'http://www.loc.gov/mods/v3', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', :version => '3.3', "xsi:schemaLocation" => 'http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd'){
+        xml.mods( 'xmlns' => 'http://www.loc.gov/mods/v3', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',:version => '3.3', "xsi:schemaLocation" => 'http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd'){
           xml.titleInfo{
             xml.title label
           }
         }
       }
-      descMetadata.content=builder.to_xml
+      self.descMetadata.content=builder.to_xml
     end
 
     def self.get_collection_title(obj)
-      xml = obj.descMetadata.ng_xml
-      title = ''
+      xml=obj.descMetadata.ng_xml
+      title=''
       title_node = xml.at_xpath('//mods:mods/mods:titleInfo/mods:title','mods' => 'http://www.loc.gov/mods/v3')
-      if title_node
+      if(title_node)
         title = title_node.content
-        subtitle = xml.at_xpath('//mods:mods/mods:titleInfo/mods:subTitle','mods' => 'http://www.loc.gov/mods/v3')
-        title += ' (' + subtitle.content + ')' if subtitle
+        subtitle=xml.at_xpath('//mods:mods/mods:titleInfo/mods:subTitle','mods' => 'http://www.loc.gov/mods/v3')
+        if(subtitle)
+          title += ' (' + subtitle.content + ')'
+        end
       end
       title
     end
@@ -266,21 +224,21 @@ module Dor
     private
     #generic updater useful for updating things like title or subtitle which can only have a single occurance and must be present
     def update_simple_field(field,new_val)
-      ds_xml = descMetadata.ng_xml
+      ds_xml=self.descMetadata.ng_xml
       ds_xml.search('//'+field,'mods' => 'http://www.loc.gov/mods/v3').each do |node|
-        node.content = new_val
+        node.content=new_val
         return true
       end
-      false
+      return false
     end
 
     # Builds case-insensitive xpath translate function call that will match the attribute to a value
     def ci_compare(attribute, value)
-      "translate(
-          @#{attribute},
-          'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-          'abcdefghijklmnopqrstuvwxyz'
-        ) = '#{value}' "
+        "translate(
+            @#{attribute},
+            'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+            'abcdefghijklmnopqrstuvwxyz'
+          ) = '#{value}' "
     end
 
   end