From 392c0e3d80996e524c7fdc8a33b1e0d2a9259cd9 Mon Sep 17 00:00:00 2001
From: Karen Estlund <kestlund@gmail.com>
Date: Thu, 29 May 2014 07:42:45 -0700
Subject: [PATCH] Added terms to form

Additional terms for folklore and sheet music. Do not merge until
rights holder and ethnographic terms are added to model.
---
 app/models/datastream/oregon_rdf.rb           |  5 +++-
 config/initializers/ingest_form_map.rb        | 24 +++++++++++++++----
 .../vocabularies/oregondigital.rb             |  2 ++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/models/datastream/oregon_rdf.rb b/app/models/datastream/oregon_rdf.rb
index 5e389680..d2243348 100644
--- a/app/models/datastream/oregon_rdf.rb
+++ b/app/models/datastream/oregon_rdf.rb
@@ -155,7 +155,7 @@ def self.resource_class
   property :locationCopyShelfLocator, :predicate => RDF::URI('http://www.loc.gov/standards/mods/modsrdf/v1#locationCopyShelfLocator') do |index|
     index.as :displayable
   end
-  property :locationCopyShelfLocator, :predicate => RDF::URI('http://www.loc.gov/standards/mods/modsrdf/v1#note') do |index|
+  property :note, :predicate => RDF::URI('http://www.loc.gov/standards/mods/modsrdf/v1#note') do |index|
     index.as :displayable
   end
   
@@ -198,6 +198,9 @@ def self.resource_class
   property :cover, :predicate => OregonDigital::Vocabularies::OREGONDIGITAL.cover do |index|
     index.as :searchable, :displayable
   end
+  property :accessionNumber, :predicate => OregonDigital::Vocabularies::OREGONDIGITAL.accessionNumber do |index|
+    index.as :searchable, :displayable
+  end
   property :exhibit, :predicate => OregonDigital::Vocabularies::OREGONDIGITAL.exhibit do |index|
     index.as :searchable, :facetable, :displayable
   end
diff --git a/config/initializers/ingest_form_map.rb b/config/initializers/ingest_form_map.rb
index 109fdbab..22ed66af 100644
--- a/config/initializers/ingest_form_map.rb
+++ b/config/initializers/ingest_form_map.rb
@@ -20,6 +20,9 @@
   title: {
     title: "descMetadata.title",
     alternative: "descMetadata.alternative",
+    captionTitle: "descMetadata.captionTitle",
+    firstLine: "descMetadata.firstLine",
+    firstLineChorus: "descMetadata.firstLineChorus",
   },
 
   creator: {
@@ -27,6 +30,10 @@
     contributor: "descMetadata.contributor",
     photographer: "descMetadata.photographer",
     illustrator: "descMetadata.illustrator",
+    composer: "descMetadata.composer",
+    lyricist: "descMetadata.lyricist",
+    arranger: "descMetadata.arranger",
+    printMaker: "descMetadata.printMaker",
   },
   
   description: {
@@ -36,10 +43,14 @@
     culturalContext: "descMetadata.culturalContext",
     inscription: "descMetadata.inscription",
     cover: "descMetadata.cover",
+    instrumentation: "descMetadata.instrumentation",
+    note: "descMetadata.note",
   },
 
   subject: {
     lcsubject: "descMetadata.lcsubject",
+    subject: "descMetadata.subject",
+    # ethnographicTerm: "descMetadata.ethnographicTerm",
   },
   
   geographic: {
@@ -47,31 +58,35 @@
   },
 
   date: {
-    created: "descMetadata.created",
-    modified: "descMetadata.modified",
     date: "descMetadata.date",
     dateSubmitted: "descMetadata.submissionDate",
+    dateDigitized: "descMetadata.dateDigitized",
     issued: "descMetadata.issued",
     earliestDate: "descMetadata.earliestDate",
     latestDate: "descMetadata.latestDate",
+    created: "descMetadata.created",
+    modified: "descMetadata.modified",
   },
 
   identifier: {
     identifier: "descMetadata.identifier",
     locationCopyShelfLocator: "descMetadata.locationCopyShelfLocator",
+    accessionNumber: "descMetadata.accessionNumber",
   },
 
   right: {
     rights: "descMetadata.rights",
     copyrightClaimant: "descMetadata.copyrightClaimant",
+    rightsHolder: "descMetadata.rightsHolder",
   },
 
-  publishing: {
+  publisher: {
     source: "descMetadata.source",
-    language: "descMetadata.language",
     publisher: "descMetadata.publisher",
     placeOfPublication: "descMetadata.placeOfPublication",
     provenance: "descMetadata.provenance",
+    largerWork: "descMetadata.largerWork",
+    hostItem: "descMetadata.hostItem",
   },
   
   type: {
@@ -111,3 +126,4 @@
     property.gsub!("descMetadata", "templateMetadata")
   end
 end
+
diff --git a/lib/oregon_digital/vocabularies/oregondigital.rb b/lib/oregon_digital/vocabularies/oregondigital.rb
index 0ae8b757..8480576d 100644
--- a/lib/oregon_digital/vocabularies/oregondigital.rb
+++ b/lib/oregon_digital/vocabularies/oregondigital.rb
@@ -17,6 +17,8 @@ class OREGONDIGITAL < ::RDF::StrictVocabulary("http://opaquenamespace.org/ns/")
     property :conversionSpecification, :label => 'Conversion Specification'
     property :captionTitle, :label => 'Caption Title'
     property :cover, :label => 'Cover'
+    property :viewDescription, :label => 'View Description'
+    property :accessionNumber, :label => 'Accession Number'
     property :exhibit, :label => 'Exhibit'
     property :dateDigitized, :label => 'Date Digitized'
     # Other terms