adiwg-mdtranslator 2.6.1 → 2.7.0

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

@@ -51,14 +51,17 @@ module ADIWG
                      end
                   end
 
-                  # taxonomy bio.2.2 (idref) - taxonomic identification reference [] {citation}
-                  # -> resourceInfo.taxonomy.idReferences.citation
+                  # taxonomy bio.2.2 (idref) - taxonomic identification reference [] {identifier}
+                  # -> resourceInfo.taxonomy.idReferences.authority
                   axTaxRef = xSystem.xpath('./idref')
                   unless axTaxRef.empty?
                      axTaxRef.each do |xTaxRef|
                         hCitation = Citation.unpack(xTaxRef, hResponseObj)
                         unless hCitation.nil?
-                           hTaxonomy[:idReferences] << hCitation
+                           hIdentifier = intMetadataClass.newIdentifier
+                           hIdentifier[:identifier] = 'none'
+                           hIdentifier[:citation] = hCitation
+                           hTaxonomy[:idReferences] << hIdentifier
                         end
                      end
                   end

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

@@ -23,11 +23,13 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   hTaxonomy = intMetadataClass.newTaxonomy
 
-                  # taxonomy bio.1 (keywtax) - taxonomic keywords {keyword}
+                  # taxonomy bio.1 (keywtax) - taxonomic keywords [] {keyword}
                   # -> resourceInfo.keywords
-                  xKeywords = xTaxonomy.xpath('./keywtax')
-                  unless xKeywords.empty?
-                     Keyword.unpack(xKeywords, hResourceInfo, hResponseObj)
+                  axKeywords = xTaxonomy.xpath('./keywtax')
+                  unless axKeywords.empty?
+                     axKeywords.each do |xKeyword|
+                        Keyword.unpack(xKeyword, hResourceInfo, hResponseObj)
+                     end
                   end
 
                   # taxonomy bio.2 (taxonsys) - taxonomic system

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

@@ -164,26 +164,26 @@ module ADIWG
                   end
 
                   # attribute - domain range of values [] {valueRange}
-                  if hAttribute.has_key?('rangeOfValues')
-                     aValueRange = hAttribute['rangeOfValues']
+                  if hAttribute.has_key?('valueRange')
+                     aValueRange = hAttribute['valueRange']
                      aValueRange.each do |hRange|
                         unless hRange.empty?
                            hReturn = ValueRange.unpack(hRange, responseObj)
                            unless hReturn.nil?
-                              intAttribute[:rangeOfValues] << hReturn
+                              intAttribute[:valueRange] << hReturn
                            end
                         end
                      end
                   end
 
                   # attribute - time period of values [] {timePeriod}
-                  if hAttribute.has_key?('timePeriodOfValues')
-                     aTimePeriods = hAttribute['timePeriodOfValues']
+                  if hAttribute.has_key?('timePeriod')
+                     aTimePeriods = hAttribute['timePeriod']
                      aTimePeriods.each do |hTimePeriod|
                         unless hTimePeriod.empty?
                            hReturn = TimePeriod.unpack(hTimePeriod, responseObj)
                            unless hReturn.nil?
-                              intAttribute[:timePeriodOfValues] << hReturn
+                              intAttribute[:timePeriod] << hReturn
                            end
                         end
                      end

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

@@ -342,14 +342,14 @@ module ADIWG
 
                   # resource information - environment description
                   if hResInfo.has_key?('environmentDescription')
-                     if hResInfo['environmentDescription'] != ''
+                     unless hResInfo['environmentDescription'] == ''
                         intResInfo[:environmentDescription] = hResInfo['environmentDescription']
                      end
                   end
 
                   # resource information - supplemental information
                   if hResInfo.has_key?('supplementalInfo')
-                     if hResInfo['supplementalInfo'] != ''
+                     unless hResInfo['supplementalInfo'] == ''
                         intResInfo[:supplementalInfo] = hResInfo['supplementalInfo']
                      end
                   end

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

@@ -16,108 +16,115 @@ require_relative 'module_scope'
 require_relative 'module_spatialResolution'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
-
-                module Source
-
-                    def self.unpack(hSource, responseObj)
-
-                        # return nil object if input is empty
-                        if hSource.empty?
-                            responseObj[:readerExecutionMessages] << 'Source object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intSource = intMetadataClass.newDataSource
-
-                        # source - description (required)
-                        if hSource.has_key?('description')
-                            intSource[:description] = hSource['description']
-                        end
-                        if intSource[:description].nil? || intSource[:description] == ''
-                            responseObj[:readerExecutionMessages] << 'Source description is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # source - source citation
-                        if hSource.has_key?('sourceCitation')
-                            hObject = hSource['sourceCitation']
-                            unless hObject.empty?
-                                hReturn = Citation.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intSource[:sourceCitation] = hReturn
-                                end
-                            end
+   module Mdtranslator
+      module Readers
+         module MdJson
+
+            module Source
+
+               def self.unpack(hSource, responseObj)
+
+                  # return nil object if input is empty
+                  if hSource.empty?
+                     responseObj[:readerExecutionMessages] << 'Source object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intSource = intMetadataClass.newDataSource
+
+                  # source - source ID
+                  if hSource.has_key?('sourceId')
+                     unless hSource['sourceId'] == ''
+                        intSource[:sourceId] = hSource['sourceId']
+                     end
+                  end
+
+                  # source - description (required)
+                  if hSource.has_key?('description')
+                     intSource[:description] = hSource['description']
+                  end
+                  if intSource[:description].nil? || intSource[:description] == ''
+                     responseObj[:readerExecutionMessages] << 'Source description is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # source - source citation
+                  if hSource.has_key?('sourceCitation')
+                     hObject = hSource['sourceCitation']
+                     unless hObject.empty?
+                        hReturn = Citation.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intSource[:sourceCitation] = hReturn
                         end
-
-                        # source - source metadata []
-                        if hSource.has_key?('metadataCitation')
-                            aCitation = hSource['metadataCitation']
-                            aCitation.each do |item|
-                                hCitation = Citation.unpack(item, responseObj)
-                                unless hCitation.nil?
-                                    intSource[:metadataCitation] << hCitation
-                                end
-                            end
+                     end
+                  end
+
+                  # source - source metadata []
+                  if hSource.has_key?('metadataCitation')
+                     aCitation = hSource['metadataCitation']
+                     aCitation.each do |item|
+                        hCitation = Citation.unpack(item, responseObj)
+                        unless hCitation.nil?
+                           intSource[:metadataCitation] << hCitation
                         end
-
-                        # source - spatial resolution
-                        if hSource.has_key?('spatialResolution')
-                            hObject = hSource['spatialResolution']
-                            unless hObject.empty?
-                                hReturn = SpatialResolution.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intSource[:spatialResolution] = hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # source - spatial resolution
+                  if hSource.has_key?('spatialResolution')
+                     hObject = hSource['spatialResolution']
+                     unless hObject.empty?
+                        hReturn = SpatialResolution.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intSource[:spatialResolution] = hReturn
                         end
-
-                        # source - reference system
-                        if hSource.has_key?('referenceSystem')
-                            hObject = hSource['referenceSystem']
-                            unless hObject.empty?
-                                hReturn = SpatialReferenceSystem.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intSource[:referenceSystem] = hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # source - reference system
+                  if hSource.has_key?('referenceSystem')
+                     hObject = hSource['referenceSystem']
+                     unless hObject.empty?
+                        hReturn = SpatialReferenceSystem.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intSource[:referenceSystem] = hReturn
                         end
-
-                        # source - source steps []
-                        if hSource.has_key?('sourceProcessStep')
-                            aSteps = hSource['sourceProcessStep']
-                            aSteps.each do |item|
-                                hStep = ProcessStep.unpack(item, responseObj)
-                                unless hStep.nil?
-                                    intSource[:sourceSteps] << hStep
-                                end
-                            end
+                     end
+                  end
+
+                  # source - source steps []
+                  if hSource.has_key?('sourceProcessStep')
+                     aSteps = hSource['sourceProcessStep']
+                     aSteps.each do |item|
+                        hStep = ProcessStep.unpack(item, responseObj)
+                        unless hStep.nil?
+                           intSource[:sourceSteps] << hStep
                         end
-
-                        # source - scope {scope}
-                        if hSource.has_key?('scope')
-                            hObject = hSource['scope']
-                            unless hObject.empty?
-                                hReturn = Scope.unpack(hObject, responseObj)
-                                unless hReturn.nil?
-                                    intSource[:scope] = hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # source - scope {scope}
+                  if hSource.has_key?('scope')
+                     hObject = hSource['scope']
+                     unless hObject.empty?
+                        hReturn = Scope.unpack(hObject, responseObj)
+                        unless hReturn.nil?
+                           intSource[:scope] = hReturn
                         end
+                     end
+                  end
 
-                        return intSource
+                  return intSource
 
-                    end
-
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end

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

@@ -18,7 +18,7 @@ module ADIWG
 
                         # return nil object if input is empty
                         if hSystem.empty?
-                            responseObj[:readerExecutionMessages] << 'TaxonomicSystem object is empty'
+                            responseObj[:readerExecutionMessages] << 'Taxonomic System object is empty'
                             responseObj[:readerExecutionPass] = false
                             return nil
                         end
@@ -36,7 +36,7 @@ module ADIWG
                             end
                         end
                         if intSystem[:citation].empty?
-                            responseObj[:readerExecutionMessages] << 'TaxonomicSystem object is missing citation'
+                            responseObj[:readerExecutionMessages] << 'Taxonomic System object is missing citation'
                             responseObj[:readerExecutionPass] = false
                             return nil
                         end

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,9 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.7.0 2017-12-26 add fgdc writer identification info section
+# 2.7.0 2017-12-26 add fgdc writer data quality info section
+# 2.7.0 2017-12-26 add fgdc writer spatial domain info section
 # 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
@@ -52,7 +55,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.6.1"
+      VERSION = "2.7.0"
    end
 end
 

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

@@ -0,0 +1,54 @@
+# FGDC <<Class>> Browse
+# FGDC CSDGM writer output in XML
+
+# History:
+#  Stan Smith 2017-12-12 original script
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Fgdc
+
+            class Browse
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hGraphic)
+
+                  # browse 1.10.1 (browsen) - browse name (required)
+                  unless hGraphic[:graphicName].nil?
+                     @xml.tag!('browsen', hGraphic[:graphicName])
+                  end
+                  if hGraphic[:graphicName].nil?
+                     @hResponseObj[:writerPass] = false
+                     @hResponseObj[:writerMessages] << 'Browse Graphic is missing name'
+                  end
+
+                  # browse 1.10.2 (browsed) - browse description (required)
+                  unless hGraphic[:graphicDescription].nil?
+                     @xml.tag!('browsed', hGraphic[:graphicDescription])
+                  end
+                  if hGraphic[:graphicDescription].nil?
+                     @hResponseObj[:writerPass] = false
+                     @hResponseObj[:writerMessages] << 'Browse Graphic is missing description'
+                  end
+
+                  # browse 1.10.3 (browset) - browse type (required)
+                  unless hGraphic[:graphicType].nil?
+                     @xml.tag!('browset', hGraphic[:graphicType])
+                  end
+                  if hGraphic[:graphicType].nil?
+                     @hResponseObj[:writerPass] = false
+                     @hResponseObj[:writerMessages] << 'Browse Graphic is missing file type'
+                  end
+
+               end # writeXML
+            end # Browse
+
+         end
+      end
+   end
+end

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

@@ -5,6 +5,7 @@
 #   Stan Smith 2017-11-17 original script
 
 require 'adiwg/mdtranslator/internal/module_dateTimeFun'
+require_relative '../fgdc_writer'
 require_relative 'class_series'
 require_relative 'class_publisher'
 require_relative 'class_citation'
@@ -21,19 +22,6 @@ module ADIWG
                   @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)
@@ -45,7 +33,8 @@ module ADIWG
                      # citation 8.1 (origin) - originator [] (required)
                      # <- hCitation[:responsibleParties] role = 'originator'
                      haveOriginator = false
-                     aOriginators = find_responsibility(hCitation, 'originator')
+                     aRParties = hCitation[:responsibleParties]
+                     aOriginators = ADIWG::Mdtranslator::Writers::Fgdc.find_responsibility(aRParties, 'originator')
                      aOriginators.each do |contactId|
                         hContact = ADIWG::Mdtranslator::Writers::Fgdc.get_contact(contactId)
                         unless hContact.empty?
@@ -65,6 +54,7 @@ module ADIWG
                      # citation 8.3 (pubtime) - publication time
                      # <- hCitation[:dates] dateType = 'publication'
                      havePubDate = false
+                     havePubTime = false
                      hCitation[:dates].each do |hDate|
                         unless hDate.empty?
                            unless hDate[:dateType].nil?
@@ -77,6 +67,7 @@ module ADIWG
                                  end
                                  unless pubTime == 'ERROR'
                                     @xml.tag!('pubtime', pubTime)
+                                    havePubTime = true
                                  end
                                  break
                               end
@@ -87,6 +78,9 @@ module ADIWG
                         @hResponseObj[:writerPass] = false
                         @hResponseObj[:writerMessages] << 'Citation is missing publication date'
                      end
+                     if !havePubTime && @hResponseObj[:writerShowTags]
+                        @xml.tag!('pubtime')
+                     end
 
                      # citation 8.4 (title) - title (required)
                      # <- hCitation[:title]
@@ -103,6 +97,9 @@ module ADIWG
                      unless hCitation[:edition].nil?
                         @xml.tag!('edition', hCitation[:edition])
                      end
+                     if hCitation[:edition].nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('edition')
+                     end
 
                      # citation 8.6 (geoform) - geospatial data presentation form
                      # <- hCitation[:presentationForm] [] - take first
@@ -112,6 +109,9 @@ module ADIWG
                            break
                         end
                      end
+                     if hCitation[:presentationForms].empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('geoform')
+                     end
 
                      # citation 8.7 (serinfo) - series information
                      # <- hCitation[:series]
@@ -120,25 +120,37 @@ module ADIWG
                            seriesClass.writeXML(hCitation[:series])
                         end
                      end
+                     if hCitation[:series].empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('serinfo')
+                     end
 
                      # citation 8.8 (pubinfo) - publication information
                      # <- hCitation[:responsibleParties] role = 'publisher'
                      # only take first publisher
-                     aPublisher = find_responsibility(hCitation, 'publisher')
+                     havePublisher = false
+                     aRParties = hCitation[:responsibleParties]
+                     aPublisher = ADIWG::Mdtranslator::Writers::Fgdc.find_responsibility(aRParties, 'publisher')
                      unless aPublisher.empty?
                         hContact = ADIWG::Mdtranslator::Writers::Fgdc.get_contact(aPublisher[0])
                         unless hContact.empty?
                            @xml.tag!('pubinfo') do
                               pubClass.writeXML(hContact)
+                              havePublisher = true
                            end
                         end
                      end
+                     if !havePublisher && @hResponseObj[:writerShowTags]
+                        @xml.tag!('pubinfo')
+                     end
 
                      # citation 8.9 (othercit) - other citation details
                      # <- hCitation[:otherDetails][0] - take first
                      unless hCitation[:otherDetails].empty?
                         @xml.tag!('othercit', hCitation[:otherDetails][0])
                      end
+                     if hCitation[:otherDetails].empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('othercit')
+                     end
 
                      # citation 8.10 (onlink) - online linkage []
                      # <- hCitation[:onlineResources][:uri]
@@ -147,20 +159,28 @@ module ADIWG
                            @xml.tag!('onlink', hOnline[:olResURI])
                         end
                      end
+                     if hCitation[:onlineResources].empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('onlink')
+                     end
 
                      # citation 8.11 (lworkcit) - larger work citation
                      # <- associatedResource[] - associationType = 'largerWorkCitation' take first
                      # <- associatedResource[:resourceCitation]
+                     haveLarger = false
                      aAssocResource.each do |hResource|
                         if hResource[:associationType] == 'largerWorkCitation'
                            unless hResource[:resourceCitation].empty?
                               @xml.tag!('lworkcit') do
                                  citationClass.writeXML(hResource[:resourceCitation], [])
+                                 haveLarger = true
                               end
                               break
                            end
                         end
                      end
+                     if !haveLarger && @hResponseObj[:writerShowTags]
+                        @xml.tag!('lworkcit')
+                     end
 
                   end # citeinfo tag
                end # writeXML