adiwg-mdtranslator 2.6.0 → 2.6.1

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_contact.rb

@@ -10,163 +10,163 @@ require_relative 'module_address'
 require_relative 'module_graphic'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
-
-                module Contact
-
-                    def self.unpack(hContact, responseObj)
-
-
-                        # return nil object if input is empty
-                        if hContact.empty?
-                            responseObj[:readerExecutionMessages] << 'Contact object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intContact = intMetadataClass.newContact
-
-                        # contact - contact id (required)
-                        if hContact.has_key?('contactId')
-                            intContact[:contactId] = hContact['contactId']
-                        end
-                        if intContact[:contactId].nil? || intContact[:contactId] == ''
-                            responseObj[:readerExecutionMessages] << 'Contact is missing contactId'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # contact - is organization (required)
-                        if hContact.has_key?('isOrganization')
-                            if hContact['isOrganization'] === true
-                                intContact[:isOrganization] = true
-                            end
-                        end
-
-                        # contact - position name
-                        if hContact.has_key?('positionName')
-                            if hContact['positionName'] != ''
-                                intContact[:positionName] = hContact['positionName']
-                            end
-                        end
-
-                        # contact - name (required if ...)
-                        # ... isOrganization = true
-                        # ... isOrganization = false && positionName = nil
-                        if hContact.has_key?('name')
-                            if hContact['name'] != ''
-                                intContact[:name] = hContact['name']
-                            end
-                        end
-                        if intContact[:name].nil? || intContact[:name] == ''
-                            if intContact[:isOrganization] === true
-                                responseObj[:readerExecutionMessages] << 'Organization contact is missing name'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
-                            if intContact[:positionName].nil? || intContact[:positionName] == ''
-                                responseObj[:readerExecutionMessages] << 'Individual contact is missing name and position'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
-                        end
-
-                        # contact - member of organization []
-                        if hContact.has_key?('memberOfOrganization')
-                            hContact['memberOfOrganization'].each do |item|
-                                if item != ''
-                                    intContact[:memberOfOrgs] << item
-                                end
-                            end
-                        end
-
-                        # contact - logo graphic [graphic]
-                        if hContact.has_key?('logoGraphic')
-                            aItems = hContact['logoGraphic']
-                            aItems.each do |item|
-                                hReturn = Graphic.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intContact[:logos] << hReturn
-                                end
-                            end
-                        end
-
-                        # contact - phone [phone]
-                        if hContact.has_key?('phone')
-                            aItems = hContact['phone']
-                            aItems.each do |item|
-                                hReturn = Phone.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intContact[:phones] << hReturn
-                                end
-                            end
-                        end
-
-                        # contact - address [address]
-                        if hContact.has_key?('address')
-                            aItems = hContact['address']
-                            aItems.each do |item|
-                                hReturn = Address.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intContact[:addresses] << hReturn
-                                end
-                            end
-                        end
-
-                        # contact - electronic mail addresses []
-                        if hContact.has_key?('electronicMailAddress')
-                            hContact['electronicMailAddress'].each do |item|
-                                if item != ''
-                                    intContact[:eMailList] << item
-                                end
-                            end
-                        end
-
-                        # contact - online resource [onlineResource]
-                        if hContact.has_key?('onlineResource')
-                            aItems = hContact['onlineResource']
-                            aItems.each do |item|
-                                hReturn = OnlineResource.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intContact[:onlineResources] << hReturn
-                                end
-                            end
-                        end
-
-                        # contact - hours of service []
-                        if hContact.has_key?('hoursOfService')
-                            hContact['hoursOfService'].each do |item|
-                                if item != ''
-                                    intContact[:hoursOfService] << item
-                                end
-                            end
-                        end
-
-                        # contact - contact instructions
-                        if hContact.has_key?('contactInstructions')
-                            if hContact['contactInstructions'] != ''
-                                intContact[:contactInstructions] = hContact['contactInstructions']
-                            end
-                        end
-
-                        # contact - contact type
-                        if hContact.has_key?('contactType')
-                            if hContact['contactType'] != ''
-                                intContact[:contactType] = hContact['contactType']
-                            end
-                        end
-
-                        return intContact
-
-                    end
-
-                end
+   module Mdtranslator
+      module Readers
+         module MdJson
+
+            module Contact
+
+               def self.unpack(hContact, responseObj)
+
+
+                  # return nil object if input is empty
+                  if hContact.empty?
+                     responseObj[:readerExecutionMessages] << 'Contact object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intContact = intMetadataClass.newContact
+
+                  # contact - contact id (required)
+                  if hContact.has_key?('contactId')
+                     intContact[:contactId] = hContact['contactId']
+                  end
+                  if intContact[:contactId].nil? || intContact[:contactId] == ''
+                     responseObj[:readerExecutionMessages] << 'Contact is missing contactId'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # contact - is organization (required)
+                  if hContact.has_key?('isOrganization')
+                     if hContact['isOrganization'] === true
+                        intContact[:isOrganization] = true
+                     end
+                  end
+
+                  # contact - position name
+                  if hContact.has_key?('positionName')
+                     if hContact['positionName'] != ''
+                        intContact[:positionName] = hContact['positionName']
+                     end
+                  end
+
+                  # contact - name (required if ...)
+                  # ... isOrganization = true
+                  # ... isOrganization = false && positionName = nil
+                  if hContact.has_key?('name')
+                     if hContact['name'] != ''
+                        intContact[:name] = hContact['name']
+                     end
+                  end
+                  if intContact[:name].nil? || intContact[:name] == ''
+                     if intContact[:isOrganization] === true
+                        responseObj[:readerExecutionMessages] << 'Organization contact is missing name'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
+                     if intContact[:positionName].nil? || intContact[:positionName] == ''
+                        responseObj[:readerExecutionMessages] << 'Individual contact is missing name and position'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
+                  end
+
+                  # contact - member of organization []
+                  if hContact.has_key?('memberOfOrganization')
+                     hContact['memberOfOrganization'].each do |item|
+                        if item != ''
+                           intContact[:memberOfOrgs] << item
+                        end
+                     end
+                  end
+
+                  # contact - logo graphic [graphic]
+                  if hContact.has_key?('logoGraphic')
+                     aItems = hContact['logoGraphic']
+                     aItems.each do |item|
+                        hReturn = Graphic.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intContact[:logos] << hReturn
+                        end
+                     end
+                  end
+
+                  # contact - phone [phone]
+                  if hContact.has_key?('phone')
+                     aItems = hContact['phone']
+                     aItems.each do |item|
+                        hReturn = Phone.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intContact[:phones] << hReturn
+                        end
+                     end
+                  end
+
+                  # contact - address [address]
+                  if hContact.has_key?('address')
+                     aItems = hContact['address']
+                     aItems.each do |item|
+                        hReturn = Address.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intContact[:addresses] << hReturn
+                        end
+                     end
+                  end
+
+                  # contact - electronic mail addresses []
+                  if hContact.has_key?('electronicMailAddress')
+                     hContact['electronicMailAddress'].each do |item|
+                        if item != ''
+                           intContact[:eMailList] << item
+                        end
+                     end
+                  end
+
+                  # contact - online resource [onlineResource]
+                  if hContact.has_key?('onlineResource')
+                     aItems = hContact['onlineResource']
+                     aItems.each do |item|
+                        hReturn = OnlineResource.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intContact[:onlineResources] << hReturn
+                        end
+                     end
+                  end
+
+                  # contact - hours of service []
+                  if hContact.has_key?('hoursOfService')
+                     hContact['hoursOfService'].each do |item|
+                        if item != ''
+                           intContact[:hoursOfService] << item
+                        end
+                     end
+                  end
+
+                  # contact - contact instructions
+                  if hContact.has_key?('contactInstructions')
+                     if hContact['contactInstructions'] != ''
+                        intContact[:contactInstructions] = hContact['contactInstructions']
+                     end
+                  end
+
+                  # contact - contact type
+                  if hContact.has_key?('contactType')
+                     if hContact['contactType'] != ''
+                        intContact[:contactType] = hContact['contactType']
+                     end
+                  end
+
+                  return intContact
+
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_body.rb

@@ -2,7 +2,8 @@
 # Reader - ScienceBase JSON to internal data structure
 
 # History:
-#   Stan Smith 2016-06-19 original script
+#  Stan Smith 2017-11-29 do not import short abstract
+#  Stan Smith 2016-06-19 original script
 
 module ADIWG
    module Mdtranslator
@@ -22,12 +23,8 @@ module ADIWG
                   end
 
                   # summary
-                  if hSbJson.has_key?('summary')
-                     sbShort = hSbJson['summary']
-                     unless sbShort.nil? || sbShort == ''
-                        hResourceInfo[:shortAbstract] = sbShort
-                     end
-                  end
+                  # do not import short abstract
+                  # sbJson forces summary to first 300 characters of abstract
 
                   return hResourceInfo
 

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,12 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.6.1 2017-11-30 add agreement number to sbJson budget facet
+# 2.6.1 2017-11-30 add metadataOnlineResources and citation onlineResources to sbJson
+# 2.6.1 2017-11-30 remove duplicate citation identifiers from sbJson
+# 2.6.1 2017-11-30 handle keywords greater than 80 characters in sbJson
+# 2.6.1 2017-11-30 do not import short abstract in sbJson
+# 2.6.0 2017-11-09 add metadataIdentifier to sbJson identifier
 # 2.6.0 2017-11-09 added data dictionary description
 # 2.6.0 2017-11-09 added readers and writers for geologic age
 # 2.5.0 2017-11-03 bug fix, add test to verify mdJson reader version is compatible with schema version
@@ -46,7 +52,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.6.0"
+      VERSION = "2.6.1"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_address.rb

@@ -0,0 +1,87 @@
+# FGDC <<Class>> Address
+# FGDC CSDGM writer output in XML
+
+# History:
+#  Stan Smith 2017-11-27 original script
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Fgdc
+
+            class Address
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hAddress)
+
+                  # contact 10.4 (cntaddr) - address information
+
+                  # contact 10.4.1 (addrtype) - contact type
+                  # <- hAddress[:addressTypes][0]
+                  unless hAddress[:addressTypes].empty?
+                     @xml.tag!('addrtype', hAddress[:addressTypes][0])
+                  end
+                  if hAddress[:addressTypes].empty?
+                     @hResponseObj[:writerPass] = false
+                     @hResponseObj[:writerMessages] << 'Address is missing type'
+                  end
+
+                  # contact 10.4.2 (address) - address lines
+                  # <- hAddress[:deliveryPoints]
+                  hAddress[:deliveryPoints].each do |addLine|
+                     @xml.tag!('address', addLine)
+                  end
+                  if hAddress[:deliveryPoints].empty? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('address')
+                  end
+
+                  # contact 10.4.3 (city) - city (required)
+                  # <- hAddress[:city]
+                  unless hAddress[:city].nil?
+                     @xml.tag!('city', hAddress[:city])
+                  end
+                  if hAddress[:city].nil?
+                     @hResponseObj[:writerPass] = false
+                     @hResponseObj[:writerMessages] << 'Address is missing city'
+                  end
+
+                  # contact 10.4.4 (state) - state (required)
+                  # <- hAddress[:adminArea]
+                  unless hAddress[:adminArea].nil?
+                     @xml.tag!('state', hAddress[:adminArea])
+                  end
+                  if hAddress[:adminArea].nil?
+                     @hResponseObj[:writerPass] = false
+                     @hResponseObj[:writerMessages] << 'Address is missing state'
+                  end
+
+                  # contact 10.4.5 (postal) - postal code (required)
+                  # <- hAddress[:postalCode]
+                  unless hAddress[:postalCode].nil?
+                     @xml.tag!('postal', hAddress[:postalCode])
+                  end
+                  if hAddress[:postalCode].nil?
+                     @hResponseObj[:writerPass] = false
+                     @hResponseObj[:writerMessages] << 'Address is missing postal code'
+                  end
+
+                  # contact 10.4.6 (country) - country
+                  # <- hAddress[:country]
+                  unless hAddress[:country].nil?
+                     @xml.tag!('country', hAddress[:country])
+                  end
+                  if hAddress[:country].nil? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('country')
+                  end
+
+               end # writeXML
+            end # Address
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_citation.rb

@@ -0,0 +1,172 @@
+# FGDC <<Class>> Citation
+# FGDC CSDGM writer output in XML
+
+# History:
+#   Stan Smith 2017-11-17 original script
+
+require 'adiwg/mdtranslator/internal/module_dateTimeFun'
+require_relative 'class_series'
+require_relative 'class_publisher'
+require_relative 'class_citation'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Fgdc
+
+            class Citation
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def find_responsibility(hCitation, roleName)
+                  aParties = []
+                  hCitation[:responsibleParties].each do |hRParty|
+                     if hRParty[:roleName] == roleName
+                        hRParty[:parties].each do |hParty|
+                           aParties << hParty[:contactId]
+                        end
+                     end
+                  end
+                  aParties = aParties.uniq
+                  return aParties
+               end
+
+               def writeXML(hCitation, aAssocResource)
+
+                  seriesClass = Series.new(@xml, @hResponseObj)
+                  pubClass = Publisher.new(@xml, @hResponseObj)
+                  citationClass = Citation.new(@xml, @hResponseObj)
+
+                  @xml.tag!('citeinfo') do
+
+                     # citation 8.1 (origin) - originator [] (required)
+                     # <- hCitation[:responsibleParties] role = 'originator'
+                     haveOriginator = false
+                     aOriginators = find_responsibility(hCitation, 'originator')
+                     aOriginators.each do |contactId|
+                        hContact = ADIWG::Mdtranslator::Writers::Fgdc.get_contact(contactId)
+                        unless hContact.empty?
+                           name = hContact[:name]
+                           unless name.nil?
+                              @xml.tag!('origin', name)
+                              haveOriginator = true
+                           end
+                        end
+                     end
+                     unless haveOriginator
+                        @hResponseObj[:writerPass] = false
+                        @hResponseObj[:writerMessages] << 'Citation is missing originator'
+                     end
+
+                     # citation 8.2 (pubdate) - publication date (required)
+                     # citation 8.3 (pubtime) - publication time
+                     # <- hCitation[:dates] dateType = 'publication'
+                     havePubDate = false
+                     hCitation[:dates].each do |hDate|
+                        unless hDate.empty?
+                           unless hDate[:dateType].nil?
+                              if hDate[:dateType] == 'publication'
+                                 pubDate = AdiwgDateTimeFun.stringDateFromDateTime(hDate[:date], hDate[:dateResolution])
+                                 pubTime = AdiwgDateTimeFun.stringTimeFromDateTime(hDate[:date], hDate[:dateResolution])
+                                 unless pubDate == 'ERROR'
+                                    @xml.tag!('pubdate', pubDate)
+                                    havePubDate = true
+                                 end
+                                 unless pubTime == 'ERROR'
+                                    @xml.tag!('pubtime', pubTime)
+                                 end
+                                 break
+                              end
+                           end
+                        end
+                     end
+                     unless havePubDate
+                        @hResponseObj[:writerPass] = false
+                        @hResponseObj[:writerMessages] << 'Citation is missing publication date'
+                     end
+
+                     # citation 8.4 (title) - title (required)
+                     # <- hCitation[:title]
+                     unless hCitation[:title].nil? || hCitation[:title] == ''
+                        @xml.tag!('title', hCitation[:title])
+                     end
+                     if hCitation[:title].nil? || hCitation[:title] == ''
+                        @hResponseObj[:writerPass] = false
+                        @hResponseObj[:writerMessages] << 'Citation is missing title'
+                     end
+
+                     # citation 8.5 (edition) - edition
+                     # <- hCitation[:edition]
+                     unless hCitation[:edition].nil?
+                        @xml.tag!('edition', hCitation[:edition])
+                     end
+
+                     # citation 8.6 (geoform) - geospatial data presentation form
+                     # <- hCitation[:presentationForm] [] - take first
+                     hCitation[:presentationForms].each do |geoForm|
+                        unless geoForm.empty?
+                           @xml.tag!('geoform', geoForm)
+                           break
+                        end
+                     end
+
+                     # citation 8.7 (serinfo) - series information
+                     # <- hCitation[:series]
+                     unless hCitation[:series].empty?
+                        @xml.tag!('serinfo') do
+                           seriesClass.writeXML(hCitation[:series])
+                        end
+                     end
+
+                     # citation 8.8 (pubinfo) - publication information
+                     # <- hCitation[:responsibleParties] role = 'publisher'
+                     # only take first publisher
+                     aPublisher = find_responsibility(hCitation, 'publisher')
+                     unless aPublisher.empty?
+                        hContact = ADIWG::Mdtranslator::Writers::Fgdc.get_contact(aPublisher[0])
+                        unless hContact.empty?
+                           @xml.tag!('pubinfo') do
+                              pubClass.writeXML(hContact)
+                           end
+                        end
+                     end
+
+                     # citation 8.9 (othercit) - other citation details
+                     # <- hCitation[:otherDetails][0] - take first
+                     unless hCitation[:otherDetails].empty?
+                        @xml.tag!('othercit', hCitation[:otherDetails][0])
+                     end
+
+                     # citation 8.10 (onlink) - online linkage []
+                     # <- hCitation[:onlineResources][:uri]
+                     hCitation[:onlineResources].each do |hOnline|
+                        unless hOnline[:olResURI].nil?
+                           @xml.tag!('onlink', hOnline[:olResURI])
+                        end
+                     end
+
+                     # citation 8.11 (lworkcit) - larger work citation
+                     # <- associatedResource[] - associationType = 'largerWorkCitation' take first
+                     # <- associatedResource[:resourceCitation]
+                     aAssocResource.each do |hResource|
+                        if hResource[:associationType] == 'largerWorkCitation'
+                           unless hResource[:resourceCitation].empty?
+                              @xml.tag!('lworkcit') do
+                                 citationClass.writeXML(hResource[:resourceCitation], [])
+                              end
+                              break
+                           end
+                        end
+                     end
+
+                  end # citeinfo tag
+               end # writeXML
+            end # Citation
+
+         end
+      end
+   end
+end