adiwg-mdtranslator 2.9.2 → 2.10.0

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

@@ -2,223 +2,223 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-02-18 refactored error and warning messaging
 # 	Stan Smith 2016-10-18 original script
 
 require_relative 'module_identifier'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
-
-                module Attribute
-
-                    def self.unpack(hAttribute, responseObj)
-
-                        # return nil object if input is empty
-                        if hAttribute.empty?
-                            responseObj[:readerExecutionMessages] << 'Attribute object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intAttGroup = intMetadataClass.newAttribute
-
-                        # attribute group - sequence identifier
-                        if hAttribute.has_key?('sequenceIdentifier')
-                            if hAttribute['sequenceIdentifier'] != ''
-                                intAttGroup[:sequenceIdentifier] = hAttribute['sequenceIdentifier']
-                            end
-                        end
-
-                        # attribute group - sequence identifier type (required if)
-                        unless intAttGroup[:sequenceIdentifier].nil?
-                            if hAttribute.has_key?('sequenceIdentifierType')
-                                if hAttribute['sequenceIdentifierType'] != ''
-                                    intAttGroup[:sequenceIdentifierType] = hAttribute['sequenceIdentifierType']
-                                end
-                            end
-                            if intAttGroup[:sequenceIdentifierType].nil?
-                                responseObj[:readerExecutionMessages] << 'Attribute attribute sequenceIdentifierType is missing'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
-                        end
-
-                        # attribute group - attribute description
-                        if hAttribute.has_key?('attributeDescription')
-                            if hAttribute['attributeDescription'] != ''
-                                intAttGroup[:attributeDescription] = hAttribute['attributeDescription']
-                            end
-                        end
-
-                        # attribute group - attribute identifier [identifier]
-                        if hAttribute.has_key?('attributeIdentifier')
-                            aItems = hAttribute['attributeIdentifier']
-                            aItems.each do |item|
-                                hReturn = Identifier.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intAttGroup[:attributeIdentifiers] << hReturn
-                                end
-                            end
-                        end
-
-                        # attribute group - min value
-                        if hAttribute.has_key?('minValue')
-                            if hAttribute['minValue'] != ''
-                                intAttGroup[:minValue] = hAttribute['minValue']
-                            end
-                        end
-
-                        # attribute group - max value
-                        if hAttribute.has_key?('maxValue')
-                            if hAttribute['maxValue'] != ''
-                                intAttGroup[:maxValue] = hAttribute['maxValue']
-                            end
-                        end
-
-                        # attribute group - units (required if)
-                        unless intAttGroup[:minValue].nil? && intAttGroup[:maxValue].nil?
-                            if hAttribute.has_key?('units')
-                                if hAttribute['units'] != ''
-                                    intAttGroup[:units] = hAttribute['units']
-                                end
-                            end
-                            if intAttGroup[:units].nil?
-                                responseObj[:readerExecutionMessages] << 'Attribute attribute units is missing'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
-                        end
-
-                        # attribute group - scale factor
-                        if hAttribute.has_key?('scaleFactor')
-                            if hAttribute['scaleFactor'] != ''
-                                intAttGroup[:scaleFactor] = hAttribute['scaleFactor']
-                            end
-                        end
-
-                        # attribute group - offset
-                        if hAttribute.has_key?('offset')
-                            if hAttribute['offset'] != ''
-                                intAttGroup[:offset] = hAttribute['offset']
-                            end
-                        end
-
-                        # attribute group - mean value
-                        if hAttribute.has_key?('meanValue')
-                            if hAttribute['meanValue'] != ''
-                                intAttGroup[:meanValue] = hAttribute['meanValue']
-                            end
-                        end
-
-                        # attribute group - number of values
-                        if hAttribute.has_key?('numberOfValues')
-                            if hAttribute['numberOfValues'] != ''
-                                intAttGroup[:numberOfValues] = hAttribute['numberOfValues']
-                            end
-                        end
-
-                        # attribute group - standard deviation
-                        if hAttribute.has_key?('standardDeviation')
-                            if hAttribute['standardDeviation'] != ''
-                                intAttGroup[:standardDeviation] = hAttribute['standardDeviation']
-                            end
-                        end
-
-                        # attribute group - bits per value
-                        if hAttribute.has_key?('bitsPerValue')
-                            if hAttribute['bitsPerValue'] != ''
-                                intAttGroup[:bitsPerValue] = hAttribute['bitsPerValue']
-                            end
-                        end
-
-                        # attribute group - bound min
-                        if hAttribute.has_key?('boundMin')
-                            if hAttribute['boundMin'] != ''
-                                intAttGroup[:boundMin] = hAttribute['boundMin']
-                            end
-                        end
-
-                        # attribute group - bound max
-                        if hAttribute.has_key?('boundMax')
-                            if hAttribute['boundMax'] != ''
-                                intAttGroup[:boundMax] = hAttribute['boundMax']
-                            end
-                        end
-
-                        # attribute group - bound units (required if)
-                        unless intAttGroup[:boundMin].nil? && intAttGroup[:boundMax].nil?
-                            if hAttribute.has_key?('boundUnits')
-                                if hAttribute['boundUnits'] != ''
-                                    intAttGroup[:boundUnits] = hAttribute['boundUnits']
-                                end
-                            end
-                            if intAttGroup[:boundUnits].nil?
-                                responseObj[:readerExecutionMessages] << 'Attribute attribute boundUnits is missing'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
-                        end
-
-                        # attribute group - peak response
-                        if hAttribute.has_key?('peakResponse')
-                            if hAttribute['peakResponse'] != ''
-                                intAttGroup[:peakResponse] = hAttribute['peakResponse']
-                            end
-                        end
-
-                        # attribute group - tone gradations
-                        if hAttribute.has_key?('toneGradations')
-                            if hAttribute['toneGradations'] != ''
-                                intAttGroup[:toneGradations] = hAttribute['toneGradations']
-                            end
-                        end
-
-                        # attribute group - band boundary definition
-                        if hAttribute.has_key?('bandBoundaryDefinition')
-                            if hAttribute['bandBoundaryDefinition'] != ''
-                                intAttGroup[:bandBoundaryDefinition] = hAttribute['bandBoundaryDefinition']
-                            end
-                        end
-
-                        # attribute group - nominal spatial resolution {measure}
-                        if hAttribute.has_key?('nominalSpatialResolution')
-                            if hAttribute['nominalSpatialResolution'] != ''
-                                intAttGroup[:nominalSpatialResolution] = hAttribute['nominalSpatialResolution']
-                            end
-                        end
-
-                        # attribute group - transfer function type
-                        if hAttribute.has_key?('transferFunctionType')
-                            if hAttribute['transferFunctionType'] != ''
-                                intAttGroup[:transferFunctionType] = hAttribute['transferFunctionType']
-                            end
-                        end
-
-                        # attribute group - transmitted polarization
-                        if hAttribute.has_key?('transmittedPolarization')
-                            if hAttribute['transmittedPolarization'] != ''
-                                intAttGroup[:transmittedPolarization] = hAttribute['transmittedPolarization']
-                            end
-                        end
-
-                        # attribute group - detected polarization
-                        if hAttribute.has_key?('detectedPolarization')
-                            if hAttribute['detectedPolarization'] != ''
-                                intAttGroup[:detectedPolarization] = hAttribute['detectedPolarization']
-                            end
-                        end
-
-                        return intAttGroup
-
-                    end
-
-                end
+   module Mdtranslator
+      module Readers
+         module MdJson
+
+            module Attribute
+
+               def self.unpack(hAttribute, responseObj)
+
+                  # return nil object if input is empty
+                  if hAttribute.empty?
+                     responseObj[:readerExecutionMessages] << 'WARNING: mdJson reader: coverage description attribute object is empty'
+                     return nil
+                  end
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intAttGroup = intMetadataClass.newAttribute
+
+                  # attribute group - sequence identifier
+                  if hAttribute.has_key?('sequenceIdentifier')
+                     unless hAttribute['sequenceIdentifier'] == ''
+                        intAttGroup[:sequenceIdentifier] = hAttribute['sequenceIdentifier']
+                     end
+                  end
+
+                  # attribute group - sequence identifier type (required if)
+                  unless intAttGroup[:sequenceIdentifier].nil?
+                     if hAttribute.has_key?('sequenceIdentifierType')
+                        unless hAttribute['sequenceIdentifierType'] == ''
+                           intAttGroup[:sequenceIdentifierType] = hAttribute['sequenceIdentifierType']
+                        end
+                     end
+                     if intAttGroup[:sequenceIdentifierType].nil?
+                        responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: coverage description attribute sequence identifierType is missing'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
+                  end
+
+                  # attribute group - attribute description
+                  if hAttribute.has_key?('attributeDescription')
+                     unless hAttribute['attributeDescription'] == ''
+                        intAttGroup[:attributeDescription] = hAttribute['attributeDescription']
+                     end
+                  end
+
+                  # attribute group - attribute identifier [identifier]
+                  if hAttribute.has_key?('attributeIdentifier')
+                     aItems = hAttribute['attributeIdentifier']
+                     aItems.each do |item|
+                        hReturn = Identifier.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intAttGroup[:attributeIdentifiers] << hReturn
+                        end
+                     end
+                  end
+
+                  # attribute group - min value
+                  if hAttribute.has_key?('minValue')
+                     unless hAttribute['minValue'] == ''
+                        intAttGroup[:minValue] = hAttribute['minValue']
+                     end
+                  end
+
+                  # attribute group - max value
+                  if hAttribute.has_key?('maxValue')
+                     unless hAttribute['maxValue'] == ''
+                        intAttGroup[:maxValue] = hAttribute['maxValue']
+                     end
+                  end
+
+                  # attribute group - units (required if)
+                  unless intAttGroup[:minValue].nil? && intAttGroup[:maxValue].nil?
+                     if hAttribute.has_key?('units')
+                        unless hAttribute['units'] == ''
+                           intAttGroup[:units] = hAttribute['units']
+                        end
+                     end
+                     if intAttGroup[:units].nil?
+                        responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: coverage description attribute units are missing'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
+                  end
+
+                  # attribute group - scale factor
+                  if hAttribute.has_key?('scaleFactor')
+                     unless hAttribute['scaleFactor'] == ''
+                        intAttGroup[:scaleFactor] = hAttribute['scaleFactor']
+                     end
+                  end
+
+                  # attribute group - offset
+                  if hAttribute.has_key?('offset')
+                     unless hAttribute['offset'] == ''
+                        intAttGroup[:offset] = hAttribute['offset']
+                     end
+                  end
+
+                  # attribute group - mean value
+                  if hAttribute.has_key?('meanValue')
+                     unless hAttribute['meanValue'] == ''
+                        intAttGroup[:meanValue] = hAttribute['meanValue']
+                     end
+                  end
+
+                  # attribute group - number of values
+                  if hAttribute.has_key?('numberOfValues')
+                     unless hAttribute['numberOfValues'] == ''
+                        intAttGroup[:numberOfValues] = hAttribute['numberOfValues']
+                     end
+                  end
+
+                  # attribute group - standard deviation
+                  if hAttribute.has_key?('standardDeviation')
+                     unless hAttribute['standardDeviation'] == ''
+                        intAttGroup[:standardDeviation] = hAttribute['standardDeviation']
+                     end
+                  end
+
+                  # attribute group - bits per value
+                  if hAttribute.has_key?('bitsPerValue')
+                     unless hAttribute['bitsPerValue'] == ''
+                        intAttGroup[:bitsPerValue] = hAttribute['bitsPerValue']
+                     end
+                  end
+
+                  # attribute group - bound min
+                  if hAttribute.has_key?('boundMin')
+                     unless hAttribute['boundMin'] == ''
+                        intAttGroup[:boundMin] = hAttribute['boundMin']
+                     end
+                  end
+
+                  # attribute group - bound max
+                  if hAttribute.has_key?('boundMax')
+                     unless hAttribute['boundMax'] == ''
+                        intAttGroup[:boundMax] = hAttribute['boundMax']
+                     end
+                  end
+
+                  # attribute group - bound units (required if)
+                  unless intAttGroup[:boundMin].nil? && intAttGroup[:boundMax].nil?
+                     if hAttribute.has_key?('boundUnits')
+                        unless hAttribute['boundUnits'] == ''
+                           intAttGroup[:boundUnits] = hAttribute['boundUnits']
+                        end
+                     end
+                     if intAttGroup[:boundUnits].nil?
+                        responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: coverage description attribute bound units are missing'
+                        responseObj[:readerExecutionPass] = false
+                        return nil
+                     end
+                  end
+
+                  # attribute group - peak response
+                  if hAttribute.has_key?('peakResponse')
+                     unless hAttribute['peakResponse'] == ''
+                        intAttGroup[:peakResponse] = hAttribute['peakResponse']
+                     end
+                  end
+
+                  # attribute group - tone gradations
+                  if hAttribute.has_key?('toneGradations')
+                     unless hAttribute['toneGradations'] == ''
+                        intAttGroup[:toneGradations] = hAttribute['toneGradations']
+                     end
+                  end
+
+                  # attribute group - band boundary definition
+                  if hAttribute.has_key?('bandBoundaryDefinition')
+                     unless hAttribute['bandBoundaryDefinition'] == ''
+                        intAttGroup[:bandBoundaryDefinition] = hAttribute['bandBoundaryDefinition']
+                     end
+                  end
+
+                  # attribute group - nominal spatial resolution {measure}
+                  if hAttribute.has_key?('nominalSpatialResolution')
+                     unless hAttribute['nominalSpatialResolution'] == ''
+                        intAttGroup[:nominalSpatialResolution] = hAttribute['nominalSpatialResolution']
+                     end
+                  end
+
+                  # attribute group - transfer function type
+                  if hAttribute.has_key?('transferFunctionType')
+                     unless hAttribute['transferFunctionType'] == ''
+                        intAttGroup[:transferFunctionType] = hAttribute['transferFunctionType']
+                     end
+                  end
+
+                  # attribute group - transmitted polarization
+                  if hAttribute.has_key?('transmittedPolarization')
+                     unless hAttribute['transmittedPolarization'] == ''
+                        intAttGroup[:transmittedPolarization] = hAttribute['transmittedPolarization']
+                     end
+                  end
+
+                  # attribute group - detected polarization
+                  if hAttribute.has_key?('detectedPolarization')
+                     unless hAttribute['detectedPolarization'] == ''
+                        intAttGroup[:detectedPolarization] = hAttribute['detectedPolarization']
+                     end
+                  end
+
+                  return intAttGroup
+
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end

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

@@ -2,62 +2,62 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-02-18 refactored error and warning messaging
 # 	Stan Smith 2016-10-18 original script
 
 require_relative 'module_attribute'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
+   module Mdtranslator
+      module Readers
+         module MdJson
 
-                module AttributeGroup
+            module AttributeGroup
 
-                    def self.unpack(hAttGroup, responseObj)
+               def self.unpack(hAttGroup, responseObj)
 
-                        # return nil object if input is empty
-                        if hAttGroup.empty?
-                            responseObj[:readerExecutionMessages] << 'Attribute Group object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # return nil object if input is empty
+                  if hAttGroup.empty?
+                     responseObj[:readerExecutionMessages] << 'WARNING: mdJson reader: coverage description attribute group object is empty'
+                     return nil
+                  end
 
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intAttGroup = intMetadataClass.newAttributeGroup
-
-                        # attribute group - attribute content type [] (required)
-                        if hAttGroup.has_key?('attributeContentType')
-                            hAttGroup['attributeContentType'].each do |item|
-                                if item != ''
-                                    intAttGroup[:attributeContentTypes] << item
-                                end
-                            end
-                        end
-                        if intAttGroup[:attributeContentTypes].empty?
-                            responseObj[:readerExecutionMessages] << 'Attribute Group attribute attributeContentType is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intAttGroup = intMetadataClass.newAttributeGroup
 
-                        # attribute group - attribute []
-                        if hAttGroup.has_key?('attribute')
-                            aItems = hAttGroup['attribute']
-                            aItems.each do |item|
-                                hReturn = Attribute.unpack(item, responseObj)
-                                unless hReturn.nil?
-                                    intAttGroup[:attributes] << hReturn
-                                end
-                            end
+                  # attribute group - attribute content type [] (required)
+                  if hAttGroup.has_key?('attributeContentType')
+                     hAttGroup['attributeContentType'].each do |item|
+                        unless item == ''
+                           intAttGroup[:attributeContentTypes] << item
                         end
+                     end
+                  end
+                  if intAttGroup[:attributeContentTypes].empty?
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: coverage description attribute group attribute content type is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # attribute group - attribute []
+                  if hAttGroup.has_key?('attribute')
+                     aItems = hAttGroup['attribute']
+                     aItems.each do |item|
+                        hReturn = Attribute.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intAttGroup[:attributes] << hReturn
+                        end
+                     end
+                  end
 
-                        return intAttGroup
-
-                    end
+                  return intAttGroup
 
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end

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

@@ -2,6 +2,7 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-02-18 refactored error and warning messaging
 # 	Stan Smith 2017-10-19 original script
 
 module ADIWG
@@ -15,8 +16,7 @@ module ADIWG
 
                   # return nil object if input is empty
                   if hBearRes.empty?
-                     responseObj[:readerExecutionMessages] << 'Bearing Distance Resolution object is empty'
-                     responseObj[:readerExecutionPass] = false
+                     responseObj[:readerExecutionMessages] << 'WARNING: mdJson reader: bearing distance resolution object is empty'
                      return nil
                   end
 
@@ -29,7 +29,7 @@ module ADIWG
                      intBearRes[:distanceResolution] = hBearRes['distanceResolution']
                   end
                   if intBearRes[:distanceResolution].nil? || intBearRes[:distanceResolution] == ''
-                     responseObj[:readerExecutionMessages] << 'Bearing Distance Resolution is missing distance resolution'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: bearing distance resolution is missing distance resolution'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
@@ -39,7 +39,7 @@ module ADIWG
                      intBearRes[:distanceUnitOfMeasure] = hBearRes['distanceUnitOfMeasure']
                   end
                   if intBearRes[:distanceUnitOfMeasure].nil? || intBearRes[:distanceUnitOfMeasure] == ''
-                     responseObj[:readerExecutionMessages] << 'Bearing Distance Resolution is missing distance unit of measure'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: bearing distance resolution distance units are missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
@@ -49,7 +49,7 @@ module ADIWG
                      intBearRes[:bearingResolution] = hBearRes['bearingResolution']
                   end
                   if intBearRes[:bearingResolution].nil? || intBearRes[:bearingResolution] == ''
-                     responseObj[:readerExecutionMessages] << 'Bearing Distance Resolution is missing bearing resolution'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: bearing distance resolution bearing resolution is missing '
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
@@ -59,7 +59,7 @@ module ADIWG
                      intBearRes[:bearingUnitOfMeasure] = hBearRes['bearingUnitOfMeasure']
                   end
                   if intBearRes[:bearingUnitOfMeasure].nil? || intBearRes[:bearingUnitOfMeasure] == ''
-                     responseObj[:readerExecutionMessages] << 'Bearing Distance resolution is missing bearing unit of measure'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: bearing distance resolution bearing units is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
@@ -69,7 +69,7 @@ module ADIWG
                      intBearRes[:bearingReferenceDirection] = hBearRes['bearingReferenceDirection']
                   end
                   if intBearRes[:bearingReferenceDirection].nil? || intBearRes[:bearingReferenceDirection] == ''
-                     responseObj[:readerExecutionMessages] << 'Bearing Distance Resolution is missing bearing direction'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: bearing distance resolution bearing direction is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
@@ -79,7 +79,7 @@ module ADIWG
                      intBearRes[:bearingReferenceMeridian] = hBearRes['bearingReferenceMeridian']
                   end
                   if intBearRes[:bearingReferenceMeridian].nil? || intBearRes[:bearingReferenceMeridian] == ''
-                     responseObj[:readerExecutionMessages] << 'Bearing Distance Resolution is missing bearing meridian'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: bearing distance resolution bearing meridian is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end