Merge pull request #907 from WGBH-MLA/new_annotation

Update annotation_types.yml

app/indexers/asset_resource_indexer.rb

@@ -28,7 +28,7 @@ def to_solr
         AnnotationTypesService.new.select_all_options.each do |type|
           # Use the ID defined in the AnnotationType service
           type_id = type[1]
-          index_document["#{type_id.underscore}_ssim"] = resource.try(type_id.to_sym) unless resource.try(type_id.to_sym).empty?
+          index_document["#{type_id.underscore}_ssim"] = resource.try(type_id.to_sym) unless resource.try(type_id.to_sym).blank?
         end
 
         #Indexing for search by batch_id

app/models/asset.rb

@@ -319,7 +319,11 @@ def canonical_meta_tag
   def proxy_start_time
     proxy_start_time ||= find_annotation_attribute("proxy_start_time")
   end
-
+
+ def ams1_legacy_metadata
+    ams1_legacy_metadata ||= find_annotation_attribute("ams1_legacy_metadata")
+  end
+
   def find_annotation_attribute(attribute)
     if admin_data.annotations.select { |a| a.annotation_type == attribute }.present?
       return admin_data.annotations.select { |a| a.annotation_type == attribute }.map(&:value)

app/models/asset_resource.rb

@@ -129,7 +129,11 @@ def canonical_meta_tag
   def proxy_start_time
     proxy_start_time ||= find_annotation_attribute("proxy_start_time")
   end
-
+
+  def ams1_legacy_metadata
+    ams1_legacy_metadata ||= find_annotation_attribute("ams1_legacy_metadata")
+  end 
+
   def find_annotation_attribute(attribute)
     if admin_data.annotations.select { |a| a.annotation_type == attribute }.present?
       return admin_data.annotations.select { |a| a.annotation_type == attribute }.map(&:value)

app/models/solr_document.rb

@@ -528,7 +528,11 @@ def md5
     # this nonsensical ':symbol' option indicates that I am selecting the _ssim suffix from down in solrizer - default was _tesim, which was wrong for this field
     self[solr_name('md5', :symbol)]
   end
-
+
+  def ams1_legacy_metadata
+    self[solr_name('ams1_legacy_metadata', :symbol)]
+  end
+
   def proxy_start_time
     self[solr_name('proxy_start_time', :symbol)]
   end

config/authorities/annotation_types.yml

@@ -39,3 +39,5 @@ terms:
     term: Transcript Source
   - id: proxy_start_time
     term: Proxy Start Time
+  - id: ams1_legacy_metadata
+    term: AMS1 Legacy Data