referent.rb in umlaut-3.1.0

- old
+ new

@@ -284,11 +284,11 @@
     citation = {}
     # call self.metadata once and use the array for efficiency, don't
     # keep calling it. profiling shows it DOES make a difference. 
     my_metadata = self.metadata
 
-    if my_metadata['atitle'] && ! my_metadata['atitle'].blank?
+    if my_metadata['atitle'].present?
       citation[:title] = my_metadata['atitle']
       citation[:title_label], citation[:container_label] = 
         case my_metadata['genre']
           when /article|journal|issue/ then ['Article Title', 'journal']
           when /bookitem|book/ then ['Chapter/Part Title', 'book']
@@ -380,10 +380,10 @@
   # TODO: All of this should be I18n'd. 
   def container_type_of_thing
     case self.metadata["genre"]
     when 'article'  then 'journal'
     when 'bookitem' then 'book'
-    else self.metadata['genre']
+    else self.metadata['genre'] || self.format
     end
   end
 
 
   def remove_value(key)