dor-services 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fe796a095980fa5dde86937ecec282bed096a0e
-  data.tar.gz: 6da19a0e7f1559941a5b8aef313c95a1c52b6f23
+  metadata.gz: f49ca049f1d4c644bc7e51811bc36562298ba729
+  data.tar.gz: 401af70a4012e11c8a26b8d9c0c3f871bd5b1a9e
 SHA512:
-  metadata.gz: 1ed1230e8f639f2cbfd2314d7faddb190958b03776d61cf66fa469c56b20a9f2533b3d169bec669b9b98870a140f6237a3fefa07542ce4d5ac23a61c8d634b01
-  data.tar.gz: b779592abbf39e09df3ad859b7b072794cb987a42522043190dbc7bffb5345004326c60cd27e660c8bed63c530be7b02cb615203e0f9c60c49ff95ee7294e631
+  metadata.gz: fd74c7ff789ae4e0e06f8dc29e8460501f64c8f765fee7addd406d61692fb7e83e037b5961a502a0d367a533dcecb112aea14a3e1e421128079b5862a22935b3
+  data.tar.gz: bcab2bbfdcd50f81c5465633d62b1c7b5d4d198f5ce5824f742a4e2f34fc48930783ff7dd30bdab006859e9b8c2c5b68b3a43a450bc72db1d6b449dc3d3b89c1

data/lib/dor/datastreams/desc_metadata_ds.rb

@@ -1,27 +1,33 @@
 module Dor
-class DescMetadataDS < ActiveFedora::OmDatastream 
-  
+class DescMetadataDS < ActiveFedora::OmDatastream
+
   MODS_NS = 'http://www.loc.gov/mods/v3'
   set_terminology do |t|
     t.root :path => 'mods', :xmlns => MODS_NS, :index_as => [:not_searchable]
     t.originInfo :index_as => [:not_searchable] do
-      t.publisher :index_as => [:searchable, :stored_searchable]
+      t.publisher :index_as => [:stored_searchable]
+      t.date_created :path => 'dateCreated', :index_as => [:stored_searchable]
       t.place :index_as => [:not_searchable] do
-        t.placeTerm :attributes => {:type => 'text'}, :index_as => [:searchable, :stored_searchable]
+        t.placeTerm :attributes => {:type => 'text'}, :index_as => [:stored_searchable]
       end
     end
+    t.subject(:index_as => [:not_searchable]) do
+      t.geographic :index_as => [:stored_searchable]
+      t.topic      :index_as => [:stored_searchable]
+      t.temporal   :index_as => [:stored_searchable]
+    end
     t.title_info(:path=>"titleInfo") {
-           t.main_title(:index_as=>[:facetable],:path=>"title", :label=>"title") {
-             t.main_title_lang(:path=>{:attribute=> "xml:lang"})
-           }
-         }
+      t.main_title(:index_as=>[:facetable], :path=>"title", :label=>"title") {
+        t.main_title_lang(:path=>{:attribute=> "xml:lang"})
+      }
+    }
     t.coordinates :index_as => [:searchable]
     t.extent      :index_as => [:searchable]
     t.scale       :index_as => [:searchable]
-    t.topic       :index_as => [:searchable]
-    t.abstract    :index_as => [:displayable]
+    t.topic       :index_as => [:stored_searchable]
+    t.abstract    :index_as => [:stored_searchable]
   end
-  
+
   def self.xml_template
     Nokogiri::XML::Builder.new do |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'){

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -85,9 +85,9 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
     if digital_object.respond_to?(:profile)
       digital_object.profile.each_pair do |property,value|
         if property =~ /Date/
-          add_solr_value(solr_doc, property.underscore,  Time.parse(value).utc.xmlschema, :date, [:searchable, :stored_searchable])
+          add_solr_value(solr_doc, property.underscore,  Time.parse(value).utc.xmlschema, :date, [:stored_searchable])
         else
-          add_solr_value(solr_doc, property.underscore, value, :string, [:searchable, :stored_searchable])
+          add_solr_value(solr_doc, property.underscore, value, :string, [:stored_searchable])
         end
       end
     end

data/lib/dor/models/describable.rb

@@ -12,6 +12,18 @@ module Dor
       has_metadata :name => "descMetadata", :type => Dor::DescMetadataDS, :label => 'Descriptive Metadata', :control_group => 'M'
     end
 
+    require 'stanford-mods/searchworks'
+
+    # intended for read-access, "as SearchWorks would see it", mostly for to_solr()
+    # @param [Nokogiri::XML::Document] content Nokogiri descMetadata document (overriding internal data)
+    # @param [boolean] ns_aware namespace awareness toggle for from_nk_node()
+    def stanford_mods(content=nil, ns_aware=true)
+      m = Stanford::Mods::Record.new
+      desc = content.nil? ? self.descMetadata.ng_xml : content
+      m.from_nk_node(desc.root, ns_aware)
+      m
+    end
+
     def fetch_descMetadata_datastream
       candidates = self.datastreams['identityMetadata'].otherId.collect { |oid| oid.to_s }
       metadata_id = Dor::MetadataService.resolvable(candidates).first
@@ -145,7 +157,13 @@ module Dor
 
     def to_solr(solr_doc=Hash.new, *args)
       super solr_doc, *args
-      add_solr_value(solr_doc, "metadata_format", self.metadata_format, :string, [:symbol, :searchable, :facetable])
+      # initialize multivalue targts if necessary
+      %w[ metadata_format_ssim sw_language_tesim sw_genre_tesim sw_format_tesim
+          sw_subject_temporal_tesim sw_subject_geographic_tesim mods_typeOfResource_tesim].each { |key|
+        solr_doc[key] ||= []
+      }
+
+      solr_doc["metadata_format_ssim"] << self.metadata_format
       begin
         dc_doc = self.generate_dublin_core
         dc_doc.xpath('/oai_dc:dc/*').each do |node|
@@ -164,8 +182,29 @@ module Dor
       rescue CrosswalkError => e
         ActiveFedora.logger.warn "Cannot index #{self.pid}.descMetadata: #{e.message}"
       end
+
+      begin
+        mods = self.stanford_mods
+        sources = {
+          'sw_language_tesim'           => :sw_language_facet,
+          'sw_genre_tesim'              => :sw_genre,
+          'sw_format_tesim'             => :format_main,   # basically sw_typeOfResource_tesim
+          'sw_subject_temporal_tesim'   => :era_facet,
+          'sw_subject_geographic_tesim' => :geographic_facet,
+          'mods_typeOfResource_tesim'   => [:term_values, :typeOfResource]
+        }
+        sources.each_pair do |solr_key, meth|
+          vals = meth.is_a?(Array) ? mods.send(meth.shift, *meth) : mods.send(meth)
+          solr_doc[solr_key].push *vals unless (vals.nil? || vals.empty?)
+          # asterisk to avoid multi-dimensional array: push values, not the array
+        end
+        solr_doc['sw_pub_date_sort_ssi'] = mods.pub_date_sort
+      end
+      # some fields get explicit "(none)" placeholder values, mostly for faceting
+      %w[sw_language_tesim sw_genre_tesim sw_format_tesim].each { |key| solr_doc[key] = ['(none)'] if solr_doc[key].empty? }
       solr_doc
     end
+
     def update_title(new_title)
       if not update_simple_field('mods:mods/mods:titleInfo/mods:title',new_title)
         raise 'Descriptive metadata has no title to update!'
@@ -194,7 +233,7 @@ module Dor
     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
       builder = Nokogiri::XML::Builder.new { |xml|
@@ -214,9 +253,7 @@ module Dor
       if(title_node)
         title = title_node.content
         subtitle=xml.at_xpath('//mods:mods/mods:titleInfo/mods:subTitle','mods' => 'http://www.loc.gov/mods/v3')
-        if(subtitle)
-          title += ' (' + subtitle.content + ')'
-        end
+        title += " (#{subtitle.content})" if subtitle
       end
       title
     end

data/lib/dor/models/processable.rb

@@ -181,17 +181,16 @@ module Dor
       sortable_milestones.each do |milestone, unordered_dates|
         dates = unordered_dates.sort
         #create the published_dt and published_day fields and the like
-        add_solr_value(solr_doc, milestone+'_day', DateTime.parse(dates.last).beginning_of_day.utc.xmlschema.split('T').first, :string, [:searchable, :stored_searchable, :facetable])
-        add_solr_value(solr_doc, milestone, dates.first, :date, [:searchable, :facetable, :stored_searchable])
+        add_solr_value(solr_doc, milestone+'_day', DateTime.parse(dates.last).beginning_of_day.utc.xmlschema.split('T').first, :string, [:stored_searchable, :facetable])
+        add_solr_value(solr_doc, milestone, dates.first, :date, [:stored_searchable, :facetable])
 
         #fields for OAI havester to sort on
         add_solr_value(solr_doc, "#{milestone}_earliest_dt", dates.first, :date, [:sortable])
-        add_solr_value(solr_doc, "#{milestone}_latest_dt", dates.last, :date, [:sortable])
+        add_solr_value(solr_doc, "#{milestone}_latest_dt",   dates.last,  :date, [:sortable])
 
         #for future faceting
         add_solr_value(solr_doc, "#{milestone}_earliest", dates.first, :date, [:searchable, :facetable])
-        add_solr_value(solr_doc, "#{milestone}_latest", dates.last, :date, [ :searchable, :facetable])
-
+        add_solr_value(solr_doc, "#{milestone}_latest",   dates.last,  :date, [:searchable, :facetable])
       end
       add_solr_value(solr_doc,"status",status,:string, [:displayable])
 

data/lib/dor/models/versionable.rb

@@ -24,7 +24,6 @@ module Dor
       raise Dor::Exception, 'Object already opened for versioning' if(new_version_open?)
       raise Dor::Exception, 'Object currently being accessioned' if(Dor::WorkflowService.get_active_lifecycle('dor', pid, 'submitted'))
 
-
       vmd_ds = datastreams['versionMetadata']
       vmd_ds.increment_version
       vmd_ds.content = vmd_ds.ng_xml.to_s
@@ -81,7 +80,7 @@ module Dor
 
     # @return [Boolean] true if the object is in a state that allows it to be modified. States that will allow modification are: has not been submitted for accessioning, has an open version or has sdr-ingest set to hold
     def allows_modification?
-      if Dor::WorkflowService.get_lifecycle('dor', pid, 'submitted' ) and not new_version_open? and not Dor::WorkflowService.get_workflow_status('dor', pid, 'accessionWF', 'sdr-ingest-transfer')=='hold'
+      if Dor::WorkflowService.get_lifecycle('dor', pid, 'submitted') && ! new_version_open? && Dor::WorkflowService.get_workflow_status('dor', pid, 'accessionWF', 'sdr-ingest-transfer')!='hold'
         false
       else
         true

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -384,6 +384,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.4
+- !ruby/object:Gem::Dependency
+  name: stanford-mods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement