sbJson_citation.rb in adiwg-mdtranslator-2.0.0rc9

- old
+ new

@@ -1,10 +1,12 @@
-# sbJson 1.0 writer
+# sbJson 1.0 writer citation
 
 # History:
 #  Stan Smith 2017-05-16 original script
 
+require_relative 'sbJson_codelists'
+
 module ADIWG
    module Mdtranslator
       module Writers
          module SbJson
 
@@ -37,21 +39,26 @@
                         end
                      end
                   end
                   aIndexes.uniq!
                   aIndexes.each do |hIndex|
-                     hContact = ADIWG::Mdtranslator::Writers::SbJson.getContact(hIndex[:index])
+                     hContact = ADIWG::Mdtranslator::Writers::SbJson.get_contact_by_index(hIndex[:index])
                      unless hContact.empty?
                         unless hContact[:name].nil?
                            citation += hContact[:name] + '(' + hIndex[:role] + '), '
                         end
                      end
                   end
 
                   # dates
                   hCitation[:dates].each do |hDate|
                      dateStr = AdiwgDateTimeFun.stringFromDateObject(hDate)
-                     citation += dateStr + '(' + hDate[:dateType] + '), '
+                     dateType = Codelists.codelist_iso_to_sb('iso_sb_date', :isoCode => hDate[:dateType])
+                     if dateType.nil?
+                        citation += dateStr + ', '
+                     else
+                        citation += dateStr + '(' + dateType + '), '
+                     end
                   end
 
                   # title
                   citation += hCitation[:title] + ', '
 