dor-services 4.25.1 → 5.0.0

data/lib/dor/models/identifiable.rb

@@ -6,8 +6,8 @@ module Dor
     include Upgradable
 
     included do
-      has_metadata :name => 'DC', :type => SimpleDublinCoreDs, :label => 'Dublin Core Record for self object'
-      has_metadata :name => 'identityMetadata', :type => Dor::IdentityMetadataDS, :label => 'Identity Metadata'
+      has_metadata :name => "DC", :type => SimpleDublinCoreDs, :label => 'Dublin Core Record for self object'
+      has_metadata :name => "identityMetadata", :type => Dor::IdentityMetadataDS, :label => 'Identity Metadata'
     end
 
     module ClassMethods
@@ -18,22 +18,24 @@ module Dor
       end
     end
 
-    def initialize attrs = {}
+    def initialize attrs={}
       if Dor::Config.suri.mint_ids
-        attrs = attrs.merge!({:pid => Dor::SuriService.mint_id, :new_object => true}) unless attrs[:pid]
+        unless attrs[:pid]
+          attrs = attrs.merge!({:pid=>Dor::SuriService.mint_id, :new_object => true})
+        end
       end
       super
     end
 
     # helper method to get the tags as an array
     def tags
-      identityMetadata.tag
+      self.identityMetadata.tag
     end
 
     # helper method to get just the content type tag
     def content_type_tag
-      content_tag = tags.select {|tag| tag.include?('Process : Content Type')}
-      content_tag.size == 1 ? content_tag[0].split(':').last.strip : ''
+      content_tag=tags.select {|tag| tag.include?('Process : Content Type')}
+      content_tag.size == 1 ? content_tag[0].split(':').last.strip : ""
     end
 
     # Syntactic sugar for identifying applied DOR Concerns
@@ -51,131 +53,134 @@ module Dor
       end
     end
 
-    @@collection_hash = {}
-    @@apo_hash        = {}
-    @@hydrus_apo_hash = {}
-    @@hydrus_collection_hash = {}
-    def to_solr(solr_doc = {}, *args)
-      assert_content_model
-      super(solr_doc)
+    ## Module-level variables, shared between ALL mixin includers!
+    @@collection_hash={}
+    @@apo_hash={}
+    @@hydrus_apo_hash={}
+    @@hydrus_collection_hash={}
+
+    def to_solr(solr_doc=Hash.new, *args)
+      self.assert_content_model
+      super(solr_doc, *args)
       solr_doc[Dor::INDEX_VERSION_FIELD] = Dor::VERSION
-      solr_doc[solr_name('indexed_at', :date)] = Time.now.utc.xmlschema
-      add_solr_value(solr_doc, 'indexed_day', Time.now.beginning_of_day.utc.xmlschema, :string, [:searchable, :facetable])
+      solr_doc['indexed_at_dtsi' ] = Time.now.utc.xmlschema
+      solr_doc['indexed_day_dtsi'] = Time.now.beginning_of_day.utc.xmlschema  # technically unnecessary, but convenient
       datastreams.values.each do |ds|
-        next if ds.new?
-        add_solr_value(solr_doc, 'ds_specs', ds.datastream_spec_string, :string, [:displayable])
+        add_solr_value(solr_doc,'ds_specs',ds.datastream_spec_string,:string,[:displayable]) unless ds.new?
       end
-      add_solr_value(solr_doc, 'title_sort', label, :string, [:sortable])
-      rels_doc = Nokogiri::XML(datastreams['RELS-EXT'].content)
-      apos = rels_doc.search('//rdf:RDF/rdf:Description/hydra:isGovernedBy', 'hydra' => 'http://projecthydra.org/ns/relations#', 'fedora' => 'info:fedora/fedora-system:def/relations-external#', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' )
+      add_solr_value(solr_doc, 'title_sort', self.label, :string, [:sortable])
+      title_attrs = [:searchable, :facetable, :displayable]
+      rels_doc = Nokogiri::XML(self.datastreams['RELS-EXT'].content)
+      apos=rels_doc.search('//rdf:RDF/rdf:Description/hydra:isGovernedBy','hydra' => 'http://projecthydra.org/ns/relations#', 'fedora' => 'info:fedora/fedora-system:def/relations-external#', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' )
       apos.each do |apo_node|
         druid = apo_node['rdf:resource']
-        next unless druid
-        druid = druid.gsub('info:fedora/','')
+        next unless druid   # TODO: a warning about the bad APO would be nice
+        druid=druid.gsub('info:fedora/','')
+        # check cache first
         if @@apo_hash.has_key?(druid) || @@hydrus_apo_hash.has_key?(druid)
-          add_solr_value(solr_doc, 'hydrus_apo_title', @@hydrus_apo_hash[druid], :string, [:searchable, :facetable]) if @@hydrus_apo_hash.has_key? druid
-          add_solr_value(solr_doc, 'apo_title', @@apo_hash[druid] , :string, [:searchable, :facetable]) if @@apo_hash.has_key? druid
+          add_solr_value(solr_doc, "hydrus_apo_title", @@hydrus_apo_hash[druid], :string, title_attrs) if @@hydrus_apo_hash.has_key? druid
+          add_solr_value(solr_doc, "apo_title", @@apo_hash[druid] , :string, title_attrs) if @@apo_hash.has_key? druid
         else
           begin
-            apo_object = Dor.find(druid)
+            apo_object=Dor.find(druid)
             if apo_object.tags.include? 'Project : Hydrus'
-              add_solr_value(solr_doc, 'hydrus_apo_title', apo_object.label, :string, [:searchable, :facetable])
-              @@hydrus_apo_hash[druid] = apo_object.label
+              add_solr_value(solr_doc, "hydrus_apo_title", apo_object.label, :string, title_attrs)
+              @@hydrus_apo_hash[druid]=apo_object.label
             else
-              add_solr_value(solr_doc, 'apo_title', apo_object.label, :string, [:searchable, :facetable])
-              @@apo_hash[druid] = apo_object.label
+              add_solr_value(solr_doc, "apo_title", apo_object.label, :string, title_attrs)
+              @@apo_hash[druid]=apo_object.label
             end
           rescue
-            add_solr_value(solr_doc, 'apo_title', druid, :string, [:searchable, :facetable])
+            add_solr_value(solr_doc, "apo_title", druid, :string, title_attrs)
           end
         end
       end
-      collections = rels_doc.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#')
+      collections=rels_doc.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#' )
       collections.each do |collection_node|
-        druid = collection_node['rdf:resource']
-        next unless druid
-        druid = druid.gsub('info:fedora/', '')
+        druid=collection_node['rdf:resource']
+        next unless druid     ## TODO: warning here would also be useful
+        druid=druid.gsub('info:fedora/','')
         if @@collection_hash.has_key?(druid) || @@hydrus_collection_hash.has_key?(druid)
-          add_solr_value(solr_doc, 'hydrus_collection_title', @@hydrus_collection_hash[druid], :string, [:searchable, :facetable]) if @@hydrus_collection_hash.has_key? druid
-          add_solr_value(solr_doc, 'collection_title', @@collection_hash[druid], :string, [:searchable, :facetable]) if @@collection_hash.has_key? druid
+          add_solr_value(solr_doc, "hydrus_collection_title", @@hydrus_collection_hash[druid], :string, title_attrs) if @@hydrus_collection_hash.has_key? druid
+          add_solr_value(solr_doc, "collection_title", @@collection_hash[druid], :string, title_attrs) if @@collection_hash.has_key? druid
         else
           begin
-            collection_object = Dor.find(druid)
+            collection_object=Dor.find(druid)
             if collection_object.tags.include? 'Project : Hydrus'
-              add_solr_value(solr_doc, 'hydrus_collection_title', collection_object.label, :string, [:searchable, :facetable])
-              @@hydrus_collection_hash[druid] = collection_object.label
+              add_solr_value(solr_doc, "hydrus_collection_title", collection_object.label, :string, title_attrs)
+              @@hydrus_collection_hash[druid]=collection_object.label
             else
-              add_solr_value(solr_doc, 'collection_title', collection_object.label, :string, [:searchable, :facetable])
-              @@collection_hash[druid] = collection_object.label
+              add_solr_value(solr_doc, "collection_title", collection_object.label, :string, title_attrs)
+              @@collection_hash[druid]=collection_object.label
             end
           rescue
-            add_solr_value(solr_doc, 'collection_title', druid, :string, [:searchable, :facetable])
+            add_solr_value(solr_doc, "collection_title", druid, :string, title_attrs)
           end
         end
       end
-      # Fix for ActiveFedora 3.3 to ensure all date fields are properly formatted as UTC XML Schema datetime strings
-      solr_doc.each_pair { |k, v|
-        next unless k =~ /(_dt|_date)$/
-        if v.is_a?(Array)
-          solr_doc[k] = v.collect { |t| Time.parse(t.to_s).utc.xmlschema }
-        else
-          solr_doc[k] = Time.parse(v.to_s).utc.xmlschema
-        end
-      }
+      solr_doc["metadata_source_ssi"] = self.identity_metadata_source
       solr_doc
     end
 
+    #@return [String] calculated value for Solr index
+    def identity_metadata_source
+      if self.identityMetadata.otherId('catkey').first ||
+         self.identityMetadata.otherId('barcode').first
+        'Symphony'
+      elsif self.identityMetadata.otherId('mdtoolkit').first
+        'Metadata Toolkit'
+      else
+        'DOR'
+      end
+    end
+
     def set_source_id(source_id)
-      identityMetadata.sourceId = source_id
+      self.identityMetadata.sourceId = source_id
     end
 
-    def add_other_Id(type, val)
-      if identityMetadata.otherId(type).length > 0
-        raise 'There is an existing entry for '+node_name+', consider using update_other_identifier.'
+    def add_other_Id(type,val)
+      if self.identityMetadata.otherId(type).length>0
+        raise 'There is an existing entry for '+type+', consider using update_other_Id().'
       end
-      identity_metadata_ds = identityMetadata
-      identity_metadata_ds.add_otherId(type+':'+val)
+      self.identityMetadata.add_otherId(type+':'+val)
     end
 
-    def update_other_Id(type, new_val, val = nil)
-      identity_metadata_ds = identityMetadata
-      ds_xml = identity_metadata_ds.ng_xml
-      # split the thing they sent in to find the node name
-      updated = false
-      ds_xml.search('//otherId[@name=\''+type+'\']').each do |node|
-        next unless node.content == val || val.nil?
-        node.content = new_val
-        updated = true
+    def update_other_Id(type, new_val, val=nil)
+      updated=false
+      self.identityMetadata.ng_xml.search('//otherId[@name=\''+type+'\']').each do |node|
+        if node.content==val || val.nil?
+          node.content=new_val
+          updated=true
+        end
       end
-      updated
+      return updated
     end
 
-    def remove_other_Id(type, val = nil)
-      ds_xml = identityMetadata.ng_xml
-      # split the thing they sent in to find the node name
-      removed = false
-      ds_xml.search('//otherId[@name=\''+type+'\']').each do |node|
-        next unless node.content === val || val.nil?
-        node.remove
-        removed = true
+    def remove_other_Id(type, val=nil)
+      removed=false
+      self.identityMetadata.ng_xml.search('//otherId[@name=\''+type+'\']').each do |node|
+        if node.content===val || val.nil?
+          node.remove
+          removed=true
+        end
       end
-      removed
+      return removed
     end
 
     # turns a tag string into an array with one element per tag part.
     # split on ":", disregard leading and trailing whitespace on tokens.
     def split_tag_to_arr(tag_str)
-      tag_str.split(':').map {|str| str.strip}
+      return tag_str.split(":").map {|str| str.strip}
     end
 
     # turn a tag array back into a tag string with a standard format
     def normalize_tag_arr(tag_arr)
-      tag_arr.join(' : ')
+      return tag_arr.join(' : ')
     end
 
     # take a tag string and return a normalized tag string
     def normalize_tag(tag_str)
-      normalize_tag_arr(split_tag_to_arr(tag_str))
+      return normalize_tag_arr(split_tag_to_arr(tag_str))
     end
 
     # take a proposed tag string and a list of the existing tags for the object being edited.  if
@@ -183,66 +188,65 @@ module Dor
     # explanatory message.
     def validate_and_normalize_tag(tag_str, existing_tag_list)
       tag_arr = validate_tag_format(tag_str)
+
       # note that the comparison for duplicate tags is case-insensitive, but we don't change case as part of the normalized version
       # we return, because we want to preserve the user's intended case.
       normalized_tag = normalize_tag_arr(tag_arr)
       dupe_existing_tag = existing_tag_list.detect { |existing_tag| normalize_tag(existing_tag).downcase == normalized_tag.downcase }
-      raise "An existing tag (#{dupe_existing_tag}) is the same, consider using update_tag?" if dupe_existing_tag
-      normalized_tag
+      if dupe_existing_tag
+        raise "An existing tag (#{dupe_existing_tag}) is the same, consider using update_tag?"
+      end
+
+      return normalized_tag
     end
 
-    # Ensure that an administrative tag meets the proper mininum format
-    # @param [String] tag_str the tag
-    # @return [Array] the tag split into an array via ':'
+    #Ensure that an administrative tag meets the proper mininum format
+    #
+    #@params tag_str [String] the tag
+    #
+    #@return [Array] the tag split into an array via ':'
     def validate_tag_format(tag_str)
       tag_arr = split_tag_to_arr(tag_str)
-      raise "Invalid tag structure:  tag '#{tag_str}' must have at least 2 elements" if tag_arr.length < 2
-      raise "Invalid tag structure:  tag '#{tag_str}' contains empty elements" if tag_arr.detect {|str| str.empty?}
-      tag_arr
+
+      if tag_arr.length < 2
+        raise ArgumentError, "Invalid tag structure: tag '#{tag_str}' must have at least 2 elements"
+      end
+
+      if tag_arr.detect {|str| str.empty?}
+        raise ArgumentError, "Invalid tag structure: tag '#{tag_str}' contains empty elements"
+      end
+      return tag_arr
     end
 
-    # Add an administrative tag to an item, you will need to seperately save the item to write it to fedora
-    # @param tag [string] The tag you wish to add
+    #Add an administrative tag to an item, you will need to seperately save the item to write it to fedora
+    #
+    #param tag [string] The tag you wish to add
     def add_tag(tag)
-      identity_metadata_ds = identityMetadata
-      normalized_tag = validate_and_normalize_tag(tag, identity_metadata_ds.tags)
-      identity_metadata_ds.add_value(:tag, normalized_tag)
+        identity_metadata_ds = self.identityMetadata
+        normalized_tag = validate_and_normalize_tag(tag, identity_metadata_ds.tags)
+        identity_metadata_ds.add_value(:tag, normalized_tag)
     end
 
     def remove_tag(tag)
-      identity_metadata_ds = identityMetadata
-      ds_xml = identity_metadata_ds.ng_xml
       removed = false
-      ds_xml.search('//tag').each do |node|
+      self.identityMetadata.ng_xml.search('//tag').each do |node|
         if normalize_tag(node.content) === normalize_tag(tag)
           node.remove
           removed = true
         end
       end
-      removed
-    end
-
-    # Removes all displayTypes from an item in preparation of adding a new display type
-    # @return Boolean True if displayTypes were removed, False if no displayTypes were removed
-    def remove_displayTypes
-      removed = false
-      identityMetadata.ng_xml.search('//displayType').each do |node|
-        node.remove
-        removed = true
-      end
-      removed
+      return removed
     end
 
     def update_tag(old_tag, new_tag)
-      identity_metadata_ds = identityMetadata
-      ds_xml = identity_metadata_ds.ng_xml
       updated = false
-      ds_xml.search('//tag').each do |node|
-        next unless normalize_tag(node.content) == normalize_tag(old_tag)
-        node.content = normalize_tag(new_tag)
-        updated = true
+      self.identityMetadata.ng_xml.search('//tag').each do |node|
+        if normalize_tag(node.content) == normalize_tag(old_tag)
+          node.content = normalize_tag(new_tag)
+          updated = true
+        end
       end
-      updated
+      return updated
     end
   end
 end

data/lib/dor/models/item.rb

@@ -1,7 +1,7 @@
 module Dor
   module BasicItem
     extend ActiveSupport::Concern
-
+    
     include Identifiable
     include Processable
     include Governable
@@ -13,11 +13,11 @@ module Dor
     include Assembleable
     include Versionable
     include Contentable
-    include Discoverable
     include Geoable
-    include Releaseable
+    include Releasable
+    
   end
-
+  
   class Abstract < ::ActiveFedora::Base
     include Identifiable
   end

data/lib/dor/models/itemizable.rb

@@ -8,20 +8,20 @@ module Dor
     included do
       has_metadata :name => "contentMetadata", :type => Dor::ContentMetadataDS, :label => 'Content Metadata', :control_group => 'M'
     end
-
+    
     DIFF_FILENAME = 'cm_inv_diff'
     DIFF_QUERY = DIFF_FILENAME.gsub('_', '-')
 
     # Deletes all cm_inv_diff files in the workspace for the Item
     def clear_diff_cache
       if Dor::Config.stacks.local_workspace_root.nil?
-        raise ArgumentError, 'Missing Dor::Config.stacks.local_workspace_root'
+        raise ArgumentError, 'Missing Dor::Config.stacks.local_workspace_root' 
       end
-      druid = DruidTools::Druid.new(pid, Dor::Config.stacks.local_workspace_root)
+      druid = DruidTools::Druid.new(self.pid, Dor::Config.stacks.local_workspace_root)
       diff_pattern = File.join(druid.temp_dir, DIFF_FILENAME + '.*')
       FileUtils.rm_f Dir.glob(diff_pattern)
     end
-
+    
     # Retrieves file difference manifest for contentMetadata from SDR
     #
     # @param [String] subset keyword for file attributes :shelve, :preserve, :publish. Default is :all.
@@ -29,7 +29,7 @@ module Dor
     # @return [String] XML contents of cm_inv_diff manifest
     def get_content_diff(subset = :all, version = nil)
       if Dor::Config.stacks.local_workspace_root.nil?
-        raise Dor::ParameterError, 'Missing Dor::Config.stacks.local_workspace_root'
+        raise Dor::ParameterError, 'Missing Dor::Config.stacks.local_workspace_root' 
       end
       unless %w{all shelve preserve publish}.include?(subset.to_s)
         raise Dor::ParameterError, "Invalid subset value: #{subset}"
@@ -40,17 +40,17 @@ module Dor
         raise Dor::ParameterError, 'Missing Dor::Config.sdr.rest_client'
       end
       sdr_client = Dor::Config.sdr.rest_client
-      current_content = datastreams['contentMetadata'].content
+      current_content = self.datastreams['contentMetadata'].content
       if current_content.nil?
         raise Dor::Exception, "Missing contentMetadata datastream"
       end
       query_string = { :subset => subset.to_s }
       query_string[:version] = version.to_s unless version.nil?
       query_string = URI.encode_www_form(query_string)
-      sdr_query = "objects/#{pid}/#{DIFF_QUERY}?#{query_string}"
+      sdr_query = "objects/#{self.pid}/#{DIFF_QUERY}?#{query_string}"
       response = sdr_client[sdr_query].post(current_content, :content_type => 'application/xml')
       response
     end
-
+    
   end
-end
+end

data/lib/dor/models/presentable.rb

@@ -0,0 +1,133 @@
+require 'iiif/presentation'
+
+module Dor
+  module Presentable
+
+    DC_NS = {"dc"=>"http://purl.org/dc/elements/1.1/", "oai_dc"=>"http://www.openarchives.org/OAI/2.0/oai_dc/"}
+
+    def iiif_presentation_manifest_needed? pub_obj_doc
+      if(pub_obj_doc.at_xpath('/publicObject/contentMetadata[@type="image"]/resource[@type="image"]'))
+        return true
+      elsif(pub_obj_doc.at_xpath('/publicObject/contentMetadata[@type="book"]/resource[@type="page"]'))
+        return true
+      else
+        return false
+      end
+    end
+
+    # Bypass this method if there are no image resources in contentMetadata
+    def build_iiif_manifest pub_obj_doc
+      id = self.pid.split(':').last
+
+      lbl_node = pub_obj_doc.at_xpath '//oai_dc:dc/dc:title', DC_NS
+      if lbl_node.nil?
+        lbl_node = pub_obj_doc.at_xpath('/publicObject/identityMetadata/objectLabel')
+      end
+      raise "Unable to build IIIF Presentation manifest:  No identityMetadata/objectLabel or dc:title" if lbl_node.nil?
+      lbl = lbl_node.text
+
+      purl_base_uri = "https://#{Dor::Config.stacks.document_cache_host}/#{id}"
+
+      manifest_data = {
+        '@id'   => "#{purl_base_uri}/iiif/manifest.json",
+        'label' => lbl,
+        'attribution' => 'Provided by the Stanford University Libraries',
+        'seeAlso' => {
+          '@id' => "#{purl_base_uri}.mods",
+          'format' => 'application/mods+xml'
+        }
+      }
+      # Use the human copyright statement for attribution if present
+      if(cr = pub_obj_doc.at_xpath('/publicObject/rightsMetadata/copyright/human[@type="copyright"]'))
+        manifest_data['attribution'] = cr.text
+      end
+
+      manifest = IIIF::Presentation::Manifest.new manifest_data
+
+      # Set viewingHint to paged if this is a book
+      if(pub_obj_doc.at_xpath('/publicObject/contentMetadata[@type="book"]'))
+        manifest.viewingHint = "paged"
+      end
+
+      metadata = []
+      # make into method, pass in xpath and label
+      add_metadata 'Creator', '//oai_dc:dc/dc:creator', metadata, pub_obj_doc
+      add_metadata 'Contributor', '//oai_dc:dc/dc:contributor', metadata, pub_obj_doc
+      add_metadata 'Publisher', '//oai_dc:dc/dc:publisher', metadata, pub_obj_doc
+      add_metadata 'Date', '//oai_dc:dc/dc:date', metadata, pub_obj_doc
+
+      # Save off the first dc:description without displayLabel
+      if(desc = pub_obj_doc.at_xpath('//oai_dc:dc/dc:description[not(@displayLabel)]', DC_NS))
+        manifest.description = desc.text
+      end
+
+      manifest.metadata = metadata unless metadata.empty?
+
+      seq_data = {
+        '@id' => "#{purl_base_uri}/sequence-1",
+        'label' => 'Current order'
+      }
+      sequence = IIIF::Presentation::Sequence.new seq_data
+
+      # for each resource image, create a canvas
+      count = 0
+      pub_obj_doc.xpath('/publicObject/contentMetadata/resource[@type="image" or @type="page"]').each do |res_node|
+        count += 1
+        img_file_name = res_node.at_xpath('file/@id').text.split('.').first
+        height = res_node.at_xpath('file/imageData/@height').text.to_i
+        width = res_node.at_xpath('file/imageData/@width').text.to_i
+        stacks_uri = "#{Dor::Config.stacks.url}/image/iiif/#{id}%2F#{img_file_name}"
+
+        canv = IIIF::Presentation::Canvas.new
+        canv['@id'] = "#{purl_base_uri}/canvas/canvas-#{count}"
+        canv.label = res_node.at_xpath('label').text
+        canv.height = height
+        canv.width = width
+
+        anno = IIIF::Presentation::Annotation.new
+        anno['@id'] = "#{purl_base_uri}/imageanno/anno-#{count}"
+        anno['on'] = canv['@id']
+
+        img_res = IIIF::Presentation::ImageResource.new
+        img_res['@id'] = "#{stacks_uri}/full/full/0/default.jpg"
+        img_res.format = 'image/jpeg'
+        img_res.height = height
+        img_res.width = width
+
+        svc = IIIF::Service.new ({
+          '@context' => 'http://iiif.io/api/image/2/context.json',
+          '@id' => stacks_uri,
+          'profile' => Dor::Config.stacks.iiif_profile
+        })
+
+        # Use the first image to create a thumbnail on the manifest
+        if count == 1
+          thumb = IIIF::Presentation::Resource.new
+          thumb['@id'] = "#{stacks_uri}/full/400,/0/default.jpg"
+          thumb.service = svc
+          manifest.thumbnail = thumb
+        end
+
+        img_res.service = svc
+        anno.resource = img_res
+        canv.images << anno
+        sequence.canvases << canv
+      end
+
+      manifest.sequences << sequence
+      manifest.to_json(:pretty => true)
+    end
+
+    def add_metadata label, xpath, metadata, pub_obj_doc
+      nodes = pub_obj_doc.xpath xpath, DC_NS
+      nodes.each do |node|
+        h = {
+          'label' => label,
+          'value' => node.text
+        }
+        metadata << h
+      end
+    end
+
+  end
+end