adiwg-mdtranslator 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95e15d92713059c8c6ebf9fe68e8e470ba617d96
-  data.tar.gz: '0094df70ff7fbb3e469bafcf5e888028937315dc'
+  metadata.gz: c04d44033db92fd29e5b27c5d27637df4821286a
+  data.tar.gz: 83a94131c5336d7daa69243d1c33b8e36f5e6a24
 SHA512:
-  metadata.gz: 1df4d37ba5555ca5ed687bea01eca86059d963d73633095a5b83dd1424da28d087617e1ad553c903a471b5c427e18d0665d3b1d5e441ad667d7860f49a18c007
-  data.tar.gz: 8e87753759f7592cc5c94563243a0a0e95fb0d2d698ffdf80234a28b642c56ccf9042da5fdf2ce80345b266fdff2a64eec8c1c650116dea129e6e0793be56f66
+  metadata.gz: 5e34810ae12393670524ae6c2c15625b88f89d6ef866731b55148190809544729a291f91ab5afc010cd7f473f62ebfdf211c2f4bf65e8919a70d2003982ee071
+  data.tar.gz: 40d1a52a6846532882102144fce79a72eea9450b3d8c77bda03fda3027e6d9304979f2099558df5aae2ac2239b2c7b58d56b2a06afa44391b86ff0ca63c3ddb0

data/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Change Log
 
-## [v2.9.0](https://github.com/adiwg/mdTranslator/tree/v2.9.0)
+## [v2.9.1](https://github.com/adiwg/mdTranslator/tree/v2.9.1)
 
-[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.8.0...v2.9.0)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.8.0...v2.9.1)
 
 **Merged pull requests:**
 

data/lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -516,7 +516,6 @@ class InternalMetadata
       {
          description: nil,
          liabilityStatement: nil,
-         technicalPrerequisite: nil,
          distributor: []
       }
    end
@@ -565,7 +564,8 @@ class InternalMetadata
       {
          formatSpecification: {},
          amendmentNumber: nil,
-         compressionMethod: nil
+         compressionMethod: nil,
+         technicalPrerequisite: nil
       }
    end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_digitalForm.rb

@@ -18,7 +18,7 @@ module ADIWG
 
             module DigitalForm
 
-               def self.unpack(xDigiForm, hResponseObj)
+               def self.unpack(xDigiForm, techPre, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -27,7 +27,7 @@ module ADIWG
                   # distribution 6.4.2.1 (digtinfo) - digital transfer information
                   xTranInfo = xDigiForm.xpath('./digtinfo')
                   unless xTranInfo.empty?
-                     TransferInfo.unpack(xTranInfo, hTransfer, hResponseObj)
+                     TransferInfo.unpack(xTranInfo, hTransfer, techPre, hResponseObj)
                   end
 
                   # distribution 6.4.2.2 (digtopt) - digital transfer option

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

@@ -50,11 +50,16 @@ module ADIWG
                      hDistribution[:liabilityStatement] = liability
                   end
 
+                  # distribution 6.6 (techpreq) - technical prerequisites
+                  # -> distribution.distributor[all].transferOption[all].distributionFormat[all].technicalPrerequisite
+                  # pass it down the line
+                  techPre = xDistribution.xpath('./techpreq').text
+
                   # distribution 6.4 (stdorder) - standard order process []
                   axOrders = xDistribution.xpath('./stdorder')
                   unless axOrders.empty?
                      axOrders.each do |xOrder|
-                        OrderProcess.unpack(xOrder, hDistributor, hResponseObj)
+                        OrderProcess.unpack(xOrder, hDistributor, techPre, hResponseObj)
                      end
                   end
 
@@ -67,13 +72,6 @@ module ADIWG
                      hDistributor[:orderProcess] << hOrder
                   end
 
-                  # distribution 6.6 (techpreq) - technical prerequisites
-                  # -> distribution.technicalPrerequisite
-                  techPre = xDistribution.xpath('./techpreq').text
-                  unless techPre.empty?
-                     hDistribution[:technicalPrerequisite] = techPre
-                  end
-
                   # distribution 6.7 (availabl) - available time period {time period}
                   # -> distribution.distributor.orderProcess.plannedAvailability
                   xTimePeriod = xDistribution.xpath('./availabl')

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_orderProcess.rb

@@ -15,7 +15,7 @@ module ADIWG
 
             module OrderProcess
 
-               def self.unpack(xOrder, hDistributor, hResponseObj)
+               def self.unpack(xOrder, hDistributor, techPre, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -37,7 +37,7 @@ module ADIWG
                   axDigital = xOrder.xpath('./digform')
                   unless axDigital.empty?
                      axDigital.each do |xDigiForm|
-                        hReturn = DigitalForm.unpack(xDigiForm, hResponseObj)
+                        hReturn = DigitalForm.unpack(xDigiForm, techPre, hResponseObj)
                         unless hReturn.nil?
                            hDistributor[:transferOptions] << hReturn
                         end

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_transferInfo.rb

@@ -15,7 +15,7 @@ module ADIWG
 
             module TransferInfo
 
-               def self.unpack(xTranInfo, hTransfer, hResponseObj)
+               def self.unpack(xTranInfo, hTransfer, techPre, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -26,6 +26,11 @@ module ADIWG
                   hFormat[:formatSpecification] = hSpecification
                   hTransfer[:distributionFormats] << hFormat
 
+                  # add technical prerequisite to resourceFormat
+                  unless techPre.empty?
+                     hFormat[:technicalPrerequisite] = techPre
+                  end
+
                   # distribution 6.4.2.1.1 (formname) - format name
                   # -> transferOption.distributionFormat.formatSpecification.title
                   # -> transferOption.distributionFormat.formatSpecification.identifier[].identifier

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

@@ -2,7 +2,6 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
-#  Stan Smith 2018-01-30 add technicalPrerequisite
 #  Stan Smith 2018-01-29 add liabilityStatement
 #  Stan Smith 2016-10-21 original script
 
@@ -42,13 +41,6 @@ module ADIWG
                      end
                   end
 
-                  # distribution - technical prerequisite
-                  if hDistribution.has_key?('technicalPrerequisite')
-                     if hDistribution['technicalPrerequisite'] != ''
-                        intDistribution[:technicalPrerequisite] = hDistribution['technicalPrerequisite']
-                     end
-                  end
-
                   # distribution - distributor [distributor]
                   if hDistribution.has_key?('distributor')
                      aItems = hDistribution['distributor']

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

@@ -2,67 +2,75 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-02-05 add 'technicalPrerequisite'
 # 	Stan Smith 2016-10-20 original script
 
 require_relative 'module_citation'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
+   module Mdtranslator
+      module Readers
+         module MdJson
 
-                module Format
+            module Format
 
-                    def self.unpack(hFormat, responseObj)
+               def self.unpack(hFormat, responseObj)
 
-                        # return nil object if input is empty
-                        if hFormat.empty?
-                            responseObj[:readerExecutionMessages] << 'Format object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # return nil object if input is empty
+                  if hFormat.empty?
+                     responseObj[:readerExecutionMessages] << 'Format object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intFormat = intMetadataClass.newResourceFormat
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intFormat = intMetadataClass.newResourceFormat
 
-                        # format - format specification {citation} (required)
-                        if hFormat.has_key?('formatSpecification')
-                            hObject = hFormat['formatSpecification']
-                            unless hObject.empty?
-                                hReturn = Citation.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intFormat[:formatSpecification] = hReturn
-                                end
-                            end
-                        end
-                        if intFormat[:formatSpecification].empty?
-                            responseObj[:readerExecutionMessages] << 'Format is missing formatSpecification'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
+                  # format - format specification {citation} (required)
+                  if hFormat.has_key?('formatSpecification')
+                     hObject = hFormat['formatSpecification']
+                     unless hObject.empty?
+                        hReturn = Citation.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intFormat[:formatSpecification] = hReturn
                         end
+                     end
+                  end
+                  if intFormat[:formatSpecification].empty?
+                     responseObj[:readerExecutionMessages] << 'Format is missing formatSpecification'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # format - amendment number
-                        if hFormat.has_key?('amendmentNumber')
-                            if hFormat['amendmentNumber'] != ''
-                                intFormat[:amendmentNumber] = hFormat['amendmentNumber']
-                            end
-                        end
+                  # format - amendment number
+                  if hFormat.has_key?('amendmentNumber')
+                     if hFormat['amendmentNumber'] != ''
+                        intFormat[:amendmentNumber] = hFormat['amendmentNumber']
+                     end
+                  end
 
-                        # format - compression method
-                        if hFormat.has_key?('compressionMethod')
-                            if hFormat['compressionMethod'] != ''
-                                intFormat[:compressionMethod] = hFormat['compressionMethod']
-                            end
-                        end
+                  # format - compression method
+                  if hFormat.has_key?('compressionMethod')
+                     if hFormat['compressionMethod'] != ''
+                        intFormat[:compressionMethod] = hFormat['compressionMethod']
+                     end
+                  end
 
-                        return intFormat
+                  # format - compression method
+                  if hFormat.has_key?('technicalPrerequisite')
+                     if hFormat['technicalPrerequisite'] != ''
+                        intFormat[:technicalPrerequisite] = hFormat['technicalPrerequisite']
+                     end
+                  end
 
-                    end
+                  return intFormat
 
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,8 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.9.1 2018-02-05 move 'technicalPrerequisite' to 'resourceFormat'
+# 2.9.1 2018-02-05 fix variable name in fgdc spatial domain writer
 # 2.9.0 2018-02-01 added fgdc writer distribution information section
 # 2.9.0 2018-01-26 deprecate dictionaryFormat in favor of dictionaryFunctionalLanguage
 # 2.9.0 2018-01-25 added fgdc writer entity and attribute section
@@ -61,7 +63,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.9.0"
+      VERSION = "2.9.1"
    end
 end
 

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

@@ -115,11 +115,28 @@ module ADIWG
                         end
 
                         # distribution 6.6 (techpreq) - technical prerequisites
-                        # <- distribution.technicalPrerequisite
-                        unless hDistribution[:technicalPrerequisite].nil?
-                           @xml.tag!('techpreq', hDistribution[:technicalPrerequisite])
+                        # -> distribution.distributor[all].transferOption[all].distributionFormat[all].technicalPrerequisite
+                        # collect these and string unique together
+                        techPre = ''
+                        aTechPre = []
+                        unless hDistributor.empty?
+                           hDistributor[:transferOptions].each do |hTransOpt|
+                              hTransOpt[:distributionFormats].each do |hFormat|
+                                 unless hFormat[:technicalPrerequisite].nil?
+                                    aTechPre << hFormat[:technicalPrerequisite]
+                                 end
+                              end
+                           end
+                        end
+                        aTechPre = aTechPre.uniq
+                        aTechPre.each do |prereq|
+                           techPre += prereq + '; '
+                        end
+                        techPre.chomp!('; ')
+                        unless techPre == ''
+                           @xml.tag!('techpreq', techPre)
                         end
-                        if hDistribution[:technicalPrerequisite].nil?
+                        if techPre == ''
                            @xml.tag!('techpreq')
                         end
 

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

@@ -2,7 +2,8 @@
 # FGDC CSDGM writer output in XML
 
 # History:
-#   Stan Smith 2017-11-25 original script
+#  Stan Smith 2018-02-05 fixed typo in variable name 'aBPoly'
+#  Stan Smith 2017-11-25 original script
 
 module ADIWG
    module Mdtranslator
@@ -18,7 +19,7 @@ module ADIWG
 
                def writeXML(aExtents)
 
-                  # spatial domain section is no required under bio extension rules
+                  # spatial domain section is not required under biological extension rules
 
                   # look for geographic description - take first
                   # <- geographicExtent[:description]
@@ -54,7 +55,7 @@ module ADIWG
 
                   # look for bounding polygon
                   # <- geographicExtent[:geographicElements]
-                  # polygon must be in FeatureCollection with properties description of 'FGDC bounding polygon'
+                  # polygon must be in a FeatureCollection with properties description of 'FGDC bounding polygon'
                   aBPoly = []
                   aExtents.each do |hExtent|
                      unless hExtent.empty?
@@ -81,7 +82,7 @@ module ADIWG
                   end
 
                   # spatial domain 1.5 (spdom)
-                  unless geoDescription.empty? && hBBox.empty? && hBPoly.empty?
+                  unless geoDescription.empty? && hBBox.empty? && aBPoly.empty?
                      @xml.tag!('spdom') do
 
                         # spatial domain bio (descgeog) - geographic description (required)

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

@@ -30,10 +30,15 @@ module ADIWG
                   # transfer information 6.4.2.1.1 (formname) - format name (required)
                   # <- formatSpecification.identifier.identifier
                   # FGDC requires a format name for digital options (online and offline)
-                  # the format name is saved in the format specification of the first distribution format
+                  # the format name is saved in the identifier of the format specification
+                  # of the first distribution format
+                  # as backup, allow specification title to serve as format name
                   haveId = false
                   unless hSpec.empty?
-                     unless hSpec[:identifiers].empty?
+                     if hSpec[:identifiers].empty?
+                        @xml.tag!('formname', hSpec[:title])
+                        haveId = true
+                     else
                         unless hSpec[:identifiers][0][:identifier].nil?
                            @xml.tag!('formname', hSpec[:identifiers][0][:identifier])
                            haveId = true
@@ -42,7 +47,7 @@ module ADIWG
                   end
                   unless haveId
                      @hResponseObj[:writerPass] = false
-                     @hResponseObj[:writerMessages] << 'Distribution Format is mission format name'
+                     @hResponseObj[:writerMessages] << 'Distribution Format is missing format name'
                   end
 
                   # transfer information 6.4.2.1.2 (formvern) - format version number

data/lib/adiwg/mdtranslator/writers/html/sections/html_distribution.rb

@@ -2,7 +2,6 @@
 # distribution
 
 # History:
-#  Stan Smith 2018-01-30 add technicalPrerequisite
 #  Stan Smith 2018-01-29 add liabilityStatement
 # 	Stan Smith 2017-04-04 original script
 
@@ -40,14 +39,6 @@ module ADIWG
                      end
                   end
 
-                  # distribution - technical prerequisite
-                  unless hDistribution[:technicalPrerequisite].nil?
-                     @html.em('Technical Prerequisite:')
-                     @html.section(:class => 'block') do
-                        @html.text!(hDistribution[:technicalPrerequisite])
-                     end
-                  end
-
                   # distribution - distributor [] {distributor}
                   hDistribution[:distributor].each do |hDistributor|
                      @html.details do

data/lib/adiwg/mdtranslator/writers/html/sections/html_format.rb

@@ -2,6 +2,7 @@
 # format
 
 # History:
+#  Stan Smith 2018-02-05 add 'technicalPrerequisite'
 #  Stan Smith 2017-04-03 refactored for mdTranslator 2.0
 #  Stan Smith 2015-09-21 added compression method element
 # 	Stan Smith 2015-03-27 original script
@@ -48,6 +49,14 @@ module ADIWG
                      @html.br
                   end
 
+                  # distribution - technical prerequisite
+                  unless hFormat[:technicalPrerequisite].nil?
+                     @html.em('Technical Prerequisite:')
+                     @html.section(:class => 'block') do
+                        @html.text!(hFormat[:technicalPrerequisite])
+                     end
+                  end
+
                end # writeHtml
             end # Html_Format
 

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_distribution.rb

@@ -21,7 +21,6 @@ module ADIWG
                   Jbuilder.new do |json|
                      json.description hDistribution[:description]
                      json.liabilityStatement hDistribution[:liabilityStatement]
-                     json.technicalPrerequisite hDistribution[:technicalPrerequisite]
                      json.distributor @Namespace.json_map(hDistribution[:distributor], Distributor)
                   end
 

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_format.rb

@@ -20,6 +20,7 @@ module ADIWG
                      json.formatSpecification Citation.build(hFormat[:formatSpecification]) unless hFormat[:formatSpecification].empty?
                      json.amendmentNumber hFormat[:amendmentNumber]
                      json.compressionMethod hFormat[:compressionMethod]
+                     json.technicalPrerequisite hFormat[:technicalPrerequisite]
                   end
 
                end # build

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Stan Smith