hydra-pbcore 1.1.1 → 1.1.2

data/lib/hydra-pbcore/datastream/deprecated/digital_document.rb

@@ -76,5 +76,26 @@ class DigitalDocument < ActiveFedora::NokogiriDatastream
     return builder.doc
   end
 
+  def to_solr(solr_doc = Hash.new)
+    super(solr_doc)
+    solr_doc.merge!({"format" => "Video"})
+
+    # TODO: map PBcore's three-letter language codes to full language names
+    # Right now, everything's English.
+    if self.find_by_terms(:language).text.match("eng")
+      solr_doc.merge!(:language_facet => "English")
+    else
+      solr_doc.merge!(:language_facet => "Unknown")
+    end
+
+    # Extract 4-digit year for creation date facet in Hydra and pub_date facet in Blacklight
+    create = self.find_by_terms(:creation_date).text.strip
+    unless create.nil? or create.empty?
+      solr_doc.merge!(:create_date_facet => get_year(create))
+      solr_doc.merge!(:pub_date => get_year(create))
+    end
+    return solr_doc
+  end
+
 end
 end

data/lib/hydra-pbcore/datastream/deprecated/document.rb

@@ -15,7 +15,7 @@ class Document < ActiveFedora::NokogiriDatastream
       :attributes=>{ :source=>"Rock and Roll Hall of Fame and Museum", :annotation=>"PID" }
     )
 
-    t.main_title(:path=>"pbcoreTitle", :attributes=>{ :titleType=>"Main" }, :index_as => [:searchable, :displayable])
+    t.title(:path=>"pbcoreTitle", :attributes=>{ :titleType=>"Main" }, :index_as => [:searchable, :displayable])
     t.alternative_title(:path=>"pbcoreTitle", :attributes=>{ :titleType=>"Alternative" },
       :index_as => [:searchable, :displayable]
     )
@@ -30,7 +30,7 @@ class Document < ActiveFedora::NokogiriDatastream
     )
 
     # This is only to display all subjects
-    t.subject_topic(:path=>"pbcoreSubject", :index_as => [:searchable, :facetable])
+    t.subject(:path=>"pbcoreSubject", :index_as => [:facetable])
 
     # Individual subject types defined for entry
     t.lc_subject(:path=>"pbcoreSubject", 
@@ -59,7 +59,7 @@ class Document < ActiveFedora::NokogiriDatastream
         :index_as => [:searchable, :displayable]
     )
 
-    t.parts_list(:path=>"pbcoreDescription", 
+    t.contents(:path=>"pbcoreDescription", 
       :attributes=>{ 
         :descriptionType=>"Table of Contents",
         :descriptionTypeSource=>"pbcoreDescription/descriptionType",
@@ -70,7 +70,7 @@ class Document < ActiveFedora::NokogiriDatastream
     )
 
     # This is only to display all genres
-    t.genres(:path=>"pbcoreGenre", :index_as => [:searchable, :facetable])
+    t.genre(:path=>"pbcoreGenre", :index_as => [:facetable])
 
     # Individual genre types defined for entry
     t.getty_genre(:path=>"pbcoreGenre", 
@@ -100,7 +100,7 @@ class Document < ActiveFedora::NokogiriDatastream
     t.pbcoreRelation do
       t.pbcoreRelationIdentifier(:attributes=>{ :annotation=>"Event Series" })
     end
-    t.event_series(:ref=>[:pbcoreRelation, :pbcoreRelationIdentifier], :index_as => [:searchable, :displayable])
+    t.series(:ref=>[:pbcoreRelation, :pbcoreRelationIdentifier], :index_as => [:facetable, :displayable])
 
     # Terms for time and place
     t.event_place(:path=>"pbcoreCoverage/coverage", 
@@ -114,14 +114,13 @@ class Document < ActiveFedora::NokogiriDatastream
 
     # Contributor names and roles
     t.contributor(:path=>"pbcoreContributor") do
-      t.name_(:path=>"contributor", :index_as => [:searchable, :facetable])
+      t.name_(:path=>"contributor")
       t.role_(:path=>"contributorRole", 
-        :attributes=>{ :source=>"MARC relator terms" },
-        :index_as => [:searchable, :displayable]
+        :attributes=>{ :source=>"MARC relator terms" }
       )
     end
-    t.contributor_name(:proxy=>[:contributor, :name])
-    t.contributor_role(:proxy=>[:contributor, :role])
+    t.contributor_name(:proxy=>[:contributor, :name], :index_as => [:searchable, :facetable])
+    t.contributor_role(:proxy=>[:contributor, :role], :index_as => [:searchable, :displayable])
 
     # Publisher names and roles
     t.publisher(:path=>"pbcorePublisher") do
@@ -131,7 +130,7 @@ class Document < ActiveFedora::NokogiriDatastream
     t.publisher_name(:proxy=>[:publisher, :name], :index_as => [:searchable, :facetable])
     t.publisher_role(:proxy=>[:publisher, :role], :index_as => [:searchable, :displayable])
 
-    t.note(:path=>"pbcoreAnnotation", :atttributes=>{ :annotationType=>"Notes" }, :index_as => [:searchable])
+    t.note(:path=>"pbcoreAnnotation", :atttributes=>{ :annotationType=>"Notes" }, :index_as => [:searchable, :displayable])
 
     #
     # pbcoreInstantiation fields for the physical item
@@ -177,15 +176,15 @@ class Document < ActiveFedora::NokogiriDatastream
     t.creation_date(:ref=>[:pbcoreInstantiation, :instantiationDate], :index_as => [:not_searchable, :converted_date, :displayable])
     t.barcode(:ref=>[:pbcoreInstantiation, :instantiationIdentifier], :index_as => [:searchable, :displayable])
     t.repository(:ref=>[:pbcoreInstantiation, :instantiationLocation], :index_as => [:searchable, :displayable])
-    t.format(:ref=>[:pbcoreInstantiation, :instantiationPhysical], :index_as => [:searchable, :facetable])
-    t.standard(:ref=>[:pbcoreInstantiation, :instantiationStandard], :index_as => [:searchable, :facetable])
-    t.media_type(:ref=>[:pbcoreInstantiation, :instantiationMediaType], :index_as => [:searchable, :facetable])
+    t.media_format(:ref=>[:pbcoreInstantiation, :instantiationPhysical], :index_as => [:searchable, :facetable])
+    t.standard(:ref=>[:pbcoreInstantiation, :instantiationStandard], :index_as => [:searchable, :displayable])
+    t.media_type(:ref=>[:pbcoreInstantiation, :instantiationMediaType], :index_as => [:searchable, :displayable])
     t.generation(:ref=>[:pbcoreInstantiation, :instantiationGenerations], :index_as => [:searchable, :displayable])
     t.language(:ref=>[:pbcoreInstantiation, :instantiationLanguage], :index_as => [:searchable, :displayable])
     t.colors(:ref=>[:pbcoreInstantiation, :instantiationColors], :index_as => [:searchable, :displayable])
-    t.archival_collection(
+    t.collection(
       :ref=>[:pbcoreInstantiation, :instantiationRelation, :arc_collection], 
-      :index_as => [:searchable, :facetable]
+      :index_as => [:facetable]
     )
     t.archival_series(
       :ref=>[:pbcoreInstantiation, :instantiationRelation, :arc_series], 
@@ -198,7 +197,7 @@ class Document < ActiveFedora::NokogiriDatastream
     t.accession_number(:ref=>[:pbcoreInstantiation, :instantiationRelation, :acc_number],
       :index_as => [:searchable, :displayable]
     )
-    t.usage(:ref=>[:pbcoreInstantiation, :instantiationRights, :rightsSummary],
+    t.access(:ref=>[:pbcoreInstantiation, :instantiationRights, :rightsSummary],
       :index_as => [:searchable, :displayable]
     )
     
@@ -306,5 +305,27 @@ class Document < ActiveFedora::NokogiriDatastream
     return builder.doc
   end
 
+  def to_solr(solr_doc = Hash.new)
+    super(solr_doc)
+    solr_doc.merge!({"format" => "Video"})
+
+    # TODO: map PBcore's three-letter language codes to full language names
+    # Right now, everything's English.
+    if self.find_by_terms(:language).text.match("eng")
+      solr_doc.merge!(:language_facet => "English")
+    else
+      solr_doc.merge!(:language_facet => "Unknown")
+    end
+
+    # Extract 4-digit year for creation date facet in Hydra and pub_date facet in Blacklight
+    create = self.find_by_terms(:creation_date).text.strip
+    unless create.nil? or create.empty?
+      solr_doc.merge!(:create_date_facet => get_year(create))
+      solr_doc.merge!(:pub_date => get_year(create))
+    end
+    return solr_doc
+  end
+
+
 end
 end

data/lib/hydra-pbcore/datastream/deprecated/instantiation.rb

@@ -189,7 +189,6 @@ class Instantiation < ActiveFedora::NokogiriDatastream
     # Proxies to the relation fields
     t.next_(:proxy=>[:pbcoreInstantiation, :next_inst, :instantiationRelationIdentifier])
     t.previous_(:proxy=>[:pbcoreInstantiation, :previous_inst, :instantiationRelationIdentifier])
-
   end
 
   def self.xml_template

data/lib/hydra-pbcore/methods.rb

@@ -27,4 +27,19 @@ module HydraPbcore::Methods
     xsd.validate(self.to_pbcore_xml)
   end
 
+  # Returns the 4-digit year from a string
+  def get_year(s)
+    begin
+      return DateTime.parse(s).year.to_s
+    rescue
+      if s.match(/^\d\d\d\d$/)
+        return s.to_s
+      elsif s.match(/^(\d\d\d\d)-\d\d$/)
+        return $1.to_s
+      else
+        return nil
+      end
+    end
+  end
+
 end

data/lib/hydra-pbcore/version.rb

@@ -1,3 +1,3 @@
 module HydraPbcore
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/deprecated/digital_document_spec.rb

@@ -10,7 +10,7 @@ describe HydraPbcore::Datastream::Deprecated::DigitalDocument do
     it "should update all of the fields in #xml_template and fields not requiring additional inserted nodes" do
       [
         [:pbc_id],
-        [:main_title],
+        [:title],
         [:alternative_title],
         [:chapter],
         [:episode],
@@ -20,25 +20,25 @@ describe HydraPbcore::Datastream::Deprecated::DigitalDocument do
         [:track],
         [:translation],
         [:summary],
-        [:parts_list],
+        [:contents],
         [:lc_subject],
         [:lc_name],
         [:rh_subject],
         [:getty_genre],
         [:lc_genre],
         [:lc_subject_genre],
-        [:event_series],
+        [:series],
         [:event_place],
         [:contributor_name],
         [:contributor_role],
         [:publisher_name],
         [:publisher_role],
         [:note],
-        [:archival_collection],
+        [:collection],
         [:archival_series],
         [:collection_number],
         [:accession_number],
-        [:usage],
+        [:access],
       ].each do |pointer|
         test_val = "#{pointer.last.to_s} value"
         @object_ds.update_values( {pointer=>{"0"=>test_val}} )
@@ -154,7 +154,7 @@ describe HydraPbcore::Datastream::Deprecated::DigitalDocument do
       @object_ds.insert_contributor
       [
         "pbc_id",
-        "main_title",
+        "title",
         "alternative_title",
         "chapter",
         "episode",
@@ -164,25 +164,25 @@ describe HydraPbcore::Datastream::Deprecated::DigitalDocument do
         "track",
         "translation",
         "summary",
-        "parts_list",
+        "contents",
         "lc_subject",
         "lc_name",
         "rh_subject",
         "getty_genre",
         "lc_genre",
         "lc_subject_genre",
-        "event_series",
+        "series",
         "event_place",
         "contributor_name",
         "contributor_role",
         "publisher_name",
         "publisher_role",
         "note",
-        "archival_collection",
+        "collection",
         "archival_series",
         "collection_number",
         "accession_number",
-        "usage"
+        "access"
       ].each do |field|
         @object_ds.send("#{field}=".to_sym, field)
       end

data/spec/deprecated/document_spec.rb

@@ -10,7 +10,7 @@ describe HydraPbcore::Datastream::Deprecated::Document do
     it "should update all of the fields in #xml_template and fields not requiring additional inserted nodes" do
       [
         [:pbc_id],
-        [:main_title],
+        [:title],
         [:alternative_title],
         [:chapter],
         [:episode],
@@ -20,14 +20,14 @@ describe HydraPbcore::Datastream::Deprecated::Document do
         [:track],
         [:translation],
         [:summary],
-        [:parts_list],
+        [:contents],
         [:lc_subject],
         [:lc_name],
         [:rh_subject],
         [:getty_genre],
         [:lc_genre],
         [:lc_subject_genre],
-        [:event_series],
+        [:series],
         [:event_place],
         [:contributor_name],
         [:contributor_role],
@@ -36,17 +36,17 @@ describe HydraPbcore::Datastream::Deprecated::Document do
         [:note],
         [:barcode],
         [:repository],
-        [:format],
+        [:media_format],
         [:standard],
         [:media_type],
         [:generation],
         [:language],
         [:colors],
-        [:archival_collection],
+        [:collection],
         [:archival_series],
         [:collection_number],
         [:accession_number],
-        [:usage],
+        [:access],
         [:condition_note],
         [:cleaning_note]
       ].each do |pointer|
@@ -176,7 +176,7 @@ describe HydraPbcore::Datastream::Deprecated::Document do
       @object_ds.insert_publisher
       @object_ds.insert_contributor
       [
-        "main_title",
+        "title",
         "alternative_title",
         "chapter",
         "episode",
@@ -186,14 +186,14 @@ describe HydraPbcore::Datastream::Deprecated::Document do
         "track",
         "translation",
         "summary",
-        "parts_list",
+        "contents",
         "lc_subject",
         "lc_name",
         "rh_subject",
         "getty_genre",
         "lc_genre",
         "lc_subject_genre",
-        "event_series",
+        "series",
         "event_place",
         "event_date",
         "contributor_name",
@@ -204,17 +204,17 @@ describe HydraPbcore::Datastream::Deprecated::Document do
         "creation_date",
         "barcode",
         "repository",
-        "format",
+        "media_format",
         "standard",
         "media_type",
         "generation",
         "language",
         "colors",
-        "archival_collection",
+        "collection",
         "archival_series",
         "collection_number",
         "accession_number",
-        "usage",
+        "access",
         "condition_note",
         "cleaning_note"
       ].each do |field|