adiwg-mdtranslator 2.8.0 → 2.9.0

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

@@ -2,6 +2,7 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-01-25 rename dictionaryFormat to dictionaryFunctionalLanguage
 #  Stan Smith 2017-11-09 add dictionary description
 #  Stan Smith 2017-01-20 refactored for mdJson/mdTranslator 2.0
 #  Stan Smith 2015-07-14 refactored to remove global namespace constants
@@ -112,11 +113,15 @@ module ADIWG
                   end
 
                   # dictionary - dictionary format
-                  if hDictionary.has_key?('dictionaryFormat')
+                  # deprecate dictionaryFormat in favor of dictionaryFunctionalLanguage
+                  s = nil
+                  if hDictionary.has_key?('dictionaryFunctionalLanguage')
+                     s = hDictionary['dictionaryFunctionalLanguage']
+                  elsif hDictionary.has_key?('dictionaryFormat')
                      s = hDictionary['dictionaryFormat']
-                     unless s == ''
-                        intDictionary[:dictionaryFormat] = s
-                     end
+                  end
+                  unless s.nil? || s == ''
+                     intDictionary[:dictionaryFunctionalLanguage] = s
                   end
 
                   # dictionary - dictionary included with resource

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

@@ -2,55 +2,71 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
-#   Stan Smith 2016-10-21 original script
+#  Stan Smith 2018-01-30 add technicalPrerequisite
+#  Stan Smith 2018-01-29 add liabilityStatement
+#  Stan Smith 2016-10-21 original script
 
 require_relative 'module_distributor'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
+   module Mdtranslator
+      module Readers
+         module MdJson
 
-                module Distribution
+            module Distribution
 
-                    def self.unpack(hDistribution, responseObj)
+               def self.unpack(hDistribution, responseObj)
 
-                        # return nil object if input is empty
-                        if hDistribution.empty?
-                            responseObj[:readerExecutionMessages] << 'Distribution object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # return nil object if input is empty
+                  if hDistribution.empty?
+                     responseObj[:readerExecutionMessages] << 'Distribution object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intDistribution = intMetadataClass.newDistribution
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intDistribution = intMetadataClass.newDistribution
 
-                        # distribution - description
-                        if hDistribution.has_key?('description')
-                            if hDistribution['description'] != ''
-                                intDistribution[:description] = hDistribution['description']
-                            end
-                        end
+                  # distribution - description
+                  if hDistribution.has_key?('description')
+                     if hDistribution['description'] != ''
+                        intDistribution[:description] = hDistribution['description']
+                     end
+                  end
 
-                        # distribution - distributor [distributor]
-                        if hDistribution.has_key?('distributor')
-                            aItems = hDistribution['distributor']
-                            aItems.each do |item|
-                                hReturn = Distributor.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intDistribution[:distributor] << hReturn
-                                end
-                            end
-                        end
+                  # distribution - liability statement
+                  if hDistribution.has_key?('liabilityStatement')
+                     if hDistribution['liabilityStatement'] != ''
+                        intDistribution[:liabilityStatement] = hDistribution['liabilityStatement']
+                     end
+                  end
 
-                        return intDistribution
+                  # distribution - technical prerequisite
+                  if hDistribution.has_key?('technicalPrerequisite')
+                     if hDistribution['technicalPrerequisite'] != ''
+                        intDistribution[:technicalPrerequisite] = hDistribution['technicalPrerequisite']
+                     end
+                  end
 
-                    end
+                  # distribution - distributor [distributor]
+                  if hDistribution.has_key?('distributor')
+                     aItems = hDistribution['distributor']
+                     aItems.each do |item|
+                        hReturn = Distributor.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intDistribution[:distributor] << hReturn
+                        end
+                     end
+                  end
+
+                  return intDistribution
 
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end

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

@@ -2,69 +2,83 @@
 # Reader - ADIwg JSON V1 to internal data structure
 
 # History:
-#   Stan Smith 2016-10-07 refactored for mdJson 2.0
-#   Stan Smith 2015-07-23 added error reporting of missing items
-#   Stan Smith 2015-07-14 refactored to remove global namespace constants
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
-#   Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
+#  Stan Smith 2018-01-24 add domain item reference
+#  Stan Smith 2016-10-07 refactored for mdJson 2.0
+#  Stan Smith 2015-07-23 added error reporting of missing items
+#  Stan Smith 2015-07-14 refactored to remove global namespace constants
+#  Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
+#  Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
 # 	Stan Smith 2013-12-01 original script
 
+require_relative 'module_citation'
+
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
+   module Mdtranslator
+      module Readers
+         module MdJson
 
-                module DomainItem
+            module DomainItem
 
-                    def self.unpack(hDomItem, responseObj)
+               def self.unpack(hDomItem, responseObj)
 
-                        # return nil object if input is empty
-                        if hDomItem.empty?
-                            responseObj[:readerExecutionMessages] << 'Domain Member object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # return nil object if input is empty
+                  if hDomItem.empty?
+                     responseObj[:readerExecutionMessages] << 'Domain Member object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intItem = intMetadataClass.newDomainItem
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intItem = intMetadataClass.newDomainItem
 
-                        # data dictionary domain item - name (required)
-                        if hDomItem.has_key?('name')
-                            intItem[:itemName] = hDomItem['name']
-                        end
-                        if intItem[:itemName].nil? || intItem[:itemName] == ''
-                            responseObj[:readerExecutionMessages] << 'Data Dictionary domain item name is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # data dictionary domain item - name (required)
+                  if hDomItem.has_key?('name')
+                     intItem[:itemName] = hDomItem['name']
+                  end
+                  if intItem[:itemName].nil? || intItem[:itemName] == ''
+                     responseObj[:readerExecutionMessages] << 'Data Dictionary domain item name is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # data dictionary domain item - value (required)
-                        if hDomItem.has_key?('value')
-                            intItem[:itemValue] = hDomItem['value']
-                        end
-                        if intItem[:itemValue].nil? || intItem[:itemValue] == ''
-                            responseObj[:readerExecutionMessages] << 'Data Dictionary domain item value is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # data dictionary domain item - value (required)
+                  if hDomItem.has_key?('value')
+                     intItem[:itemValue] = hDomItem['value']
+                  end
+                  if intItem[:itemValue].nil? || intItem[:itemValue] == ''
+                     responseObj[:readerExecutionMessages] << 'Data Dictionary domain item value is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # data dictionary domain item - definition (required)
-                        if hDomItem.has_key?('definition')
-                            intItem[:itemDefinition] = hDomItem['definition']
-                        end
-                        if intItem[:itemDefinition].nil? || intItem[:itemDefinition] == ''
-                            responseObj[:readerExecutionMessages] << 'Data Dictionary domain item definition is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # data dictionary domain item - definition (required)
+                  if hDomItem.has_key?('definition')
+                     intItem[:itemDefinition] = hDomItem['definition']
+                  end
+                  if intItem[:itemDefinition].nil? || intItem[:itemDefinition] == ''
+                     responseObj[:readerExecutionMessages] << 'Data Dictionary domain item definition is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        return intItem
-                    end
+                  # data dictionary domain item - reference {citation}
+                  if hDomItem.has_key?('reference')
+                     hCitation = hDomItem['reference']
+                     unless hCitation.empty?
+                        hReturn = Citation.unpack(hCitation, responseObj)
+                        unless hReturn.nil?
+                           intItem[:itemReference] = hReturn
+                        end
+                     end
+                  end
 
-                end
+                  return intItem
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end

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

@@ -2,8 +2,9 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
-#   Stan Smith 2017-01-31 remove metadataCreationDate
-#   Stan Smith 2016-10-31 original script
+#  Stan Smith 2018-01-27 add metadataConstraints
+#  Stan Smith 2017-01-31 remove metadataCreationDate
+#  Stan Smith 2016-10-31 original script
 
 require_relative 'module_identifier'
 require_relative 'module_citation'
@@ -11,147 +12,158 @@ require_relative 'module_locale'
 require_relative 'module_responsibleParty'
 require_relative 'module_date'
 require_relative 'module_onlineResource'
+require_relative 'module_constraint'
 require_relative 'module_maintenance'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
+   module Mdtranslator
+      module Readers
+         module MdJson
 
-                module MetadataInfo
+            module MetadataInfo
 
-                    def self.unpack(hMetaInfo, responseObj)
+               def self.unpack(hMetaInfo, responseObj)
 
 
-                        # return nil object if input is empty
-                        if hMetaInfo.empty?
-                            responseObj[:readerExecutionMessages] << 'MetadataInfo object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # return nil object if input is empty
+                  if hMetaInfo.empty?
+                     responseObj[:readerExecutionMessages] << 'MetadataInfo object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intMetaInfo = intMetadataClass.newMetadataInfo
-
-                        # metadata information - metadata identifier {identifier}
-                        if hMetaInfo.has_key?('metadataIdentifier')
-                            hObject = hMetaInfo['metadataIdentifier']
-                            unless hObject.empty?
-                                hReturn = Identifier.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intMetaInfo[:metadataIdentifier] = hReturn
-                                end
-                            end
-                        end
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intMetaInfo = intMetadataClass.newMetadataInfo
 
-                        # metadata information - parent metadata {citation}
-                        if hMetaInfo.has_key?('parentMetadata')
-                            hObject = hMetaInfo['parentMetadata']
-                            unless hObject.empty?
-                                hReturn = Citation.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intMetaInfo[:parentMetadata] = hReturn
-                                end
-                            end
+                  # metadata information - metadata identifier {identifier}
+                  if hMetaInfo.has_key?('metadataIdentifier')
+                     hObject = hMetaInfo['metadataIdentifier']
+                     unless hObject.empty?
+                        hReturn = Identifier.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:metadataIdentifier] = hReturn
                         end
-
-                        # metadata information - default metadata locale {locale} (default to utf-8)
-                        if hMetaInfo.has_key?('defaultMetadataLocale')
-                            hObject = hMetaInfo['defaultMetadataLocale']
-                            unless hObject.empty?
-                                hReturn = Locale.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intMetaInfo[:defaultMetadataLocale] = hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # metadata information - parent metadata {citation}
+                  if hMetaInfo.has_key?('parentMetadata')
+                     hObject = hMetaInfo['parentMetadata']
+                     unless hObject.empty?
+                        hReturn = Citation.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:parentMetadata] = hReturn
                         end
-
-                        # metadata information - other metadata locale [] {locale}
-                        if hMetaInfo.has_key?('otherMetadataLocale')
-                            aItems = hMetaInfo['otherMetadataLocale']
-                            aItems.each do |item|
-                                hReturn = Locale.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intMetaInfo[:otherMetadataLocales] << hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # metadata information - default metadata locale {locale} (default to utf-8)
+                  if hMetaInfo.has_key?('defaultMetadataLocale')
+                     hObject = hMetaInfo['defaultMetadataLocale']
+                     unless hObject.empty?
+                        hReturn = Locale.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:defaultMetadataLocale] = hReturn
                         end
-
-                        # metadata information - metadata contact [] {responsibleParty} (required)
-                        if hMetaInfo.has_key?('metadataContact')
-                            aItems = hMetaInfo['metadataContact']
-                            aItems.each do |item|
-                                hReturn = ResponsibleParty.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intMetaInfo[:metadataContacts] << hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # metadata information - other metadata locale [] {locale}
+                  if hMetaInfo.has_key?('otherMetadataLocale')
+                     aItems = hMetaInfo['otherMetadataLocale']
+                     aItems.each do |item|
+                        hReturn = Locale.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:otherMetadataLocales] << hReturn
                         end
-                        if intMetaInfo[:metadataContacts].empty?
-                            responseObj[:readerExecutionMessages] << 'MetadataInfo object is missing metadataContacts'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
+                     end
+                  end
+
+                  # metadata information - metadata contact [] {responsibleParty} (required)
+                  if hMetaInfo.has_key?('metadataContact')
+                     aItems = hMetaInfo['metadataContact']
+                     aItems.each do |item|
+                        hReturn = ResponsibleParty.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:metadataContacts] << hReturn
                         end
-
-                        # metadata information - metadata dates [] {date}
-                        if hMetaInfo.has_key?('metadataDate')
-                            aItems = hMetaInfo['metadataDate']
-                            aItems.each do |item|
-                                hReturn = Date.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intMetaInfo[:metadataDates] << hReturn
-                                end
-                            end
+                     end
+                  end
+                  if intMetaInfo[:metadataContacts].empty?
+                     responseObj[:readerExecutionMessages] << 'MetadataInfo object is missing metadataContacts'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # metadata information - metadata dates [] {date}
+                  if hMetaInfo.has_key?('metadataDate')
+                     aItems = hMetaInfo['metadataDate']
+                     aItems.each do |item|
+                        hReturn = Date.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:metadataDates] << hReturn
                         end
-
-                        # metadata information - metadata online resource [] {onlineResource}
-                        if hMetaInfo.has_key?('metadataOnlineResource')
-                            aItems = hMetaInfo['metadataOnlineResource']
-                            aItems.each do |item|
-                                hReturn = OnlineResource.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intMetaInfo[:metadataLinkages] << hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # metadata information - metadata online resource [] {onlineResource}
+                  if hMetaInfo.has_key?('metadataOnlineResource')
+                     aItems = hMetaInfo['metadataOnlineResource']
+                     aItems.each do |item|
+                        hReturn = OnlineResource.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:metadataLinkages] << hReturn
                         end
-
-                        # metadata information - metadata maintenance {maintenance}
-                        if hMetaInfo.has_key?('metadataMaintenance')
-                            hObject = hMetaInfo['metadataMaintenance']
-                            unless hObject.empty?
-                                hReturn = Maintenance.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intMetaInfo[:metadataMaintenance] = hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # metadata information - metadata constraint [] {constraint}
+                  if hMetaInfo.has_key?('metadataConstraint')
+                     hMetaInfo['metadataConstraint'].each do |hItem|
+                        hReturn = Constraint.unpack(hItem, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:metadataConstraints] << hReturn
                         end
-
-                        # metadata information - alternative metadata reference [] {citation}
-                        if hMetaInfo.has_key?('alternateMetadataReference')
-                            aItems = hMetaInfo['alternateMetadataReference']
-                            aItems.each do |item|
-                                hReturn = Citation.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intMetaInfo[:alternateMetadataReferences] << hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # metadata information - metadata maintenance {maintenance}
+                  if hMetaInfo.has_key?('metadataMaintenance')
+                     hObject = hMetaInfo['metadataMaintenance']
+                     unless hObject.empty?
+                        hReturn = Maintenance.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:metadataMaintenance] = hReturn
                         end
-
-                        # metadata information - metadata status
-                        if hMetaInfo.has_key?('metadataStatus')
-                            if hMetaInfo['metadataStatus'] != ''
-                                intMetaInfo[:metadataStatus] = hMetaInfo['metadataStatus']
-                            end
+                     end
+                  end
+
+                  # metadata information - alternative metadata reference [] {citation}
+                  if hMetaInfo.has_key?('alternateMetadataReference')
+                     aItems = hMetaInfo['alternateMetadataReference']
+                     aItems.each do |item|
+                        hReturn = Citation.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intMetaInfo[:alternateMetadataReferences] << hReturn
                         end
+                     end
+                  end
 
-                        return intMetaInfo
+                  # metadata information - metadata status
+                  if hMetaInfo.has_key?('metadataStatus')
+                     if hMetaInfo['metadataStatus'] != ''
+                        intMetaInfo[:metadataStatus] = hMetaInfo['metadataStatus']
+                     end
+                  end
 
-                    end
+                  return intMetaInfo
 
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end