adiwg-mdtranslator 2.12.0 → 2.13.0

data/lib/adiwg/mdtranslator/writers/iso19110/iso19110_writer.rb

@@ -1,6 +1,7 @@
 # Writer - internal data structure to ISO 19110:2003
 
 # History:
+#  Stan Smith 2018-03-30 add error/warning/notice message methods
 #  Stan Smith 2017-05-26 allow choice of which dictionary to translate
 #                    ... fix bug when no dictionary is provided in mdJson
 #  Stan Smith 2017-01-20 refactor for mdJson/mdTranslator 2.0
@@ -20,7 +21,7 @@ module ADIWG
       module Writers
          module Iso19110
 
-            def self.startWriter(intObj, responseObj, whichDict: 0)
+            def self.startWriter(intObj, hResponseObj, whichDict: 0)
 
                # Iso19110 can only output one dictionary at a time
                # test if requested dictionary is in input file
@@ -33,7 +34,7 @@ module ADIWG
                # make objects available to the instance
                @intObj = intObj
                @contacts = intObj[:contacts]
-               @hResponseObj = responseObj
+               @hResponseObj = hResponseObj
                dictionary = intObj[:dataDictionaries][whichDict]
                @domains = dictionary[:domains]
 
@@ -43,14 +44,14 @@ module ADIWG
                @aMessagesList = hMessageList['messageList']
 
                # set the format of the output file based on the writer specified
-               responseObj[:writerOutputFormat] = 'xml'
-               responseObj[:writerVersion] = ADIWG::Mdtranslator::Writers::Iso19110::VERSION
+               hResponseObj[:writerOutputFormat] = 'xml'
+               hResponseObj[:writerVersion] = ADIWG::Mdtranslator::Writers::Iso19110::VERSION
 
                # create new XML document
                @xml = Builder::XmlMarkup.new(indent: 3)
 
                # start writing the ISO 19110 XML record
-               metadataWriter = FC_FeatureCatalogue.new(@xml, responseObj)
+               metadataWriter = FC_FeatureCatalogue.new(@xml, hResponseObj)
                metadata = metadataWriter.writeXML(intObj)
 
                return metadata

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

@@ -2,111 +2,111 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-11-18 refactored for mdTranslator/mdJson 2.0
-#   Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
-#   Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (hResponseObj)
-#   Stan Smith 2014-12-23 refactored to drop physical address elements if no
-#                     ... deliveryPoints are provided
-#   Stan Smith 2014-12-22 added return if passed nil address objects
-#   Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
+#  Stan Smith 2016-11-18 refactored for mdTranslator/mdJson 2.0
+#  Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
+#  Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
+#  Stan Smith 2015-06-22 replace global ($response) with passed in object (hResponseObj)
+#  Stan Smith 2014-12-23 refactored to drop physical address elements if no
+#  ... deliveryPoints are provided
+#  Stan Smith 2014-12-22 added return if passed nil address objects
+#  Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
 # 	Stan Smith 2013-08-09 original script
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class CI_Address
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hAddress, aEmail)
-
-                        @xml.tag!('gmd:CI_Address') do
-
-
-                            unless hAddress.nil?
-
-                                # address - address type (not used by ISO 19115-2)
-
-                                # address - description (not used by ISO 19115-2)
-
-                                # address - delivery points []
-                                aDeliveryPoints = hAddress[:deliveryPoints]
-                                aDeliveryPoints.each do |myPoint|
-                                    @xml.tag!('gmd:deliveryPoint') do
-                                        @xml.tag!('gco:CharacterString', myPoint)
-                                    end
-                                end
-                                if aDeliveryPoints.empty? && @hResponseObj[:writerShowTags]
-                                    @xml.tag!('gmd:deliveryPoint')
-                                end
-
-                                # address - city
-                                s = hAddress[:city]
-                                unless s.nil?
-                                    @xml.tag!('gmd:city') do
-                                        @xml.tag!('gco:CharacterString', s)
-                                    end
-                                end
-                                if s.nil? && @hResponseObj[:writerShowTags]
-                                    @xml.tag!('gmd:city')
-                                end
-
-                                # address - administrative area
-                                s = hAddress[:adminArea]
-                                unless s.nil?
-                                    @xml.tag!('gmd:administrativeArea') do
-                                        @xml.tag!('gco:CharacterString', s)
-                                    end
-                                end
-                                if s.nil? && @hResponseObj[:writerShowTags]
-                                    @xml.tag!('gmd:administrativeArea')
-                                end
-
-                                # address - postal code
-                                s = hAddress[:postalCode]
-                                unless s.nil?
-                                    @xml.tag!('gmd:postalCode') do
-                                        @xml.tag!('gco:CharacterString', s)
-                                    end
-                                end
-                                if s.nil? && @hResponseObj[:writerShowTags]
-                                    @xml.tag!('gmd:postalCode')
-                                end
-
-                                # address - country
-                                s = hAddress[:country]
-                                unless s.nil?
-                                    @xml.tag!('gmd:country') do
-                                        @xml.tag!('gco:CharacterString', s)
-                                    end
-                                end
-                                if s.nil? && @hResponseObj[:writerShowTags]
-                                    @xml.tag!('gmd:country')
-                                end
-
-                            end
-
-                            # address - email addresses []
-                            aEmail.each do |myEmail|
-                                @xml.tag!('gmd:electronicMailAddress') do
-                                    @xml.tag!('gco:CharacterString', myEmail)
-                                end
-                            end
-                            if aEmail.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:electronicMailAddress')
-                            end
-
-                        end # CI_Address tag
-                    end # writeXML
-                end # CI_Address class
-
-            end
-        end
-    end
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class CI_Address
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hAddress, aEmail)
+
+                  @xml.tag!('gmd:CI_Address') do
+
+
+                     unless hAddress.nil?
+
+                        # address - address type (not used by ISO 19115-2)
+
+                        # address - description (not used by ISO 19115-2)
+
+                        # address - delivery points []
+                        aDeliveryPoints = hAddress[:deliveryPoints]
+                        aDeliveryPoints.each do |myPoint|
+                           @xml.tag!('gmd:deliveryPoint') do
+                              @xml.tag!('gco:CharacterString', myPoint)
+                           end
+                        end
+                        if aDeliveryPoints.empty? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('gmd:deliveryPoint')
+                        end
+
+                        # address - city
+                        s = hAddress[:city]
+                        unless s.nil?
+                           @xml.tag!('gmd:city') do
+                              @xml.tag!('gco:CharacterString', s)
+                           end
+                        end
+                        if s.nil? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('gmd:city')
+                        end
+
+                        # address - administrative area
+                        s = hAddress[:adminArea]
+                        unless s.nil?
+                           @xml.tag!('gmd:administrativeArea') do
+                              @xml.tag!('gco:CharacterString', s)
+                           end
+                        end
+                        if s.nil? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('gmd:administrativeArea')
+                        end
+
+                        # address - postal code
+                        s = hAddress[:postalCode]
+                        unless s.nil?
+                           @xml.tag!('gmd:postalCode') do
+                              @xml.tag!('gco:CharacterString', s)
+                           end
+                        end
+                        if s.nil? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('gmd:postalCode')
+                        end
+
+                        # address - country
+                        s = hAddress[:country]
+                        unless s.nil?
+                           @xml.tag!('gmd:country') do
+                              @xml.tag!('gco:CharacterString', s)
+                           end
+                        end
+                        if s.nil? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('gmd:country')
+                        end
+
+                     end
+
+                     # address - email addresses []
+                     aEmail.each do |myEmail|
+                        @xml.tag!('gmd:electronicMailAddress') do
+                           @xml.tag!('gco:CharacterString', myEmail)
+                        end
+                     end
+                     if aEmail.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:electronicMailAddress')
+                     end
+
+                  end # CI_Address tag
+               end # writeXML
+            end # CI_Address class
+
+         end
+      end
+   end
 end

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_aggregateInformation.rb

@@ -2,81 +2,84 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-11-23 refactored for mdTranslator/mdJson 2.0
-#   Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
-#   Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (hResponseObj)
-#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
-#   Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
-#   Stan Smith 2014-11-06 take initiativeType from internal initiativeType
-#   ... rather than resourceType for 0.9.0
-#   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
+#  Stan Smith 2018-04-09 add error and warning messaging
+#  Stan Smith 2016-11-23 refactored for mdTranslator/mdJson 2.0
+#  Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
+#  Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
+#  Stan Smith 2015-06-22 replace global ($response) with passed in object (hResponseObj)
+#  Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
+#  Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
+#  Stan Smith 2014-11-06 take initiativeType from internal initiativeType
+#  ... rather than resourceType for 0.9.0
+#  Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 # 	Stan Smith 2014-05-29 original script
 
+require_relative '../iso19115_2_writer'
 require_relative 'class_codelist'
 require_relative 'class_citation'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
 
-                class MD_AggregateInformation
+            class MD_AggregateInformation
 
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_2
+               end
 
-                    def writeXML(hAssocRes)
+               def writeXML(hAssocRes)
 
-                        # classes used
-                        codelistClass =  MD_Codelist.new(@xml, @hResponseObj)
-                        citationClass =  CI_Citation.new(@xml, @hResponseObj)
+                  # classes used
+                  codelistClass = MD_Codelist.new(@xml, @hResponseObj)
+                  citationClass = CI_Citation.new(@xml, @hResponseObj)
 
-                        @xml.tag!('gmd:MD_AggregateInformation') do
+                  @xml.tag!('gmd:MD_AggregateInformation') do
 
-                            # aggregate information - aggregate data set name {citation}
-                            hAssocCit = hAssocRes[:resourceCitation]
-                            unless hAssocCit.empty?
-                                @xml.tag!('gmd:aggregateDataSetName') do
-                                    citationClass.writeXML(hAssocCit)
-                                end
-                            end
-                            if hAssocCit.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:aggregateDataSetName')
-                            end
+                     # aggregate information - aggregate data set name {citation}
+                     hAssocCit = hAssocRes[:resourceCitation]
+                     unless hAssocCit.empty?
+                        @xml.tag!('gmd:aggregateDataSetName') do
+                           citationClass.writeXML(hAssocCit, 'associated resource')
+                        end
+                     end
+                     if hAssocCit.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:aggregateDataSetName')
+                     end
 
-                            # aggregate information - aggregate data set identifier (use citation > identifier)
-                            # data set identifier was dropped from 19115-1
+                     # aggregate information - aggregate data set identifier (use citation > identifier)
+                     # data set identifier was dropped from 19115-1 and not carried in mdJson
 
-                            # aggregate information - association type (required)
-                            s = hAssocRes[:associationType]
-                            unless s.nil?
-                                @xml.tag!('gmd:associationType') do
-                                    codelistClass.writeXML('gmd', 'iso_associationType',s)
-                                end
-                            end
-                            if s.nil? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:associationType')
-                            end
+                     # aggregate information - association type (required)
+                     s = hAssocRes[:associationType]
+                     unless s.nil?
+                        @xml.tag!('gmd:associationType') do
+                           codelistClass.writeXML('gmd', 'iso_associationType', s)
+                        end
+                     end
+                     if s.nil?
+                        @NameSpace.issueWarning(1, 'gmd:associationType')
+                     end
 
-                            # aggregate information - initiative type
-                            s = hAssocRes[:initiativeType]
-                            unless s.nil?
-                                @xml.tag!('gmd:initiativeType') do
-                                    codelistClass.writeXML('gmd', 'iso_initiativeType',s)
-                                end
-                            end
-                            if s.nil? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:initiativeType')
-                            end
+                     # aggregate information - initiative type
+                     s = hAssocRes[:initiativeType]
+                     unless s.nil?
+                        @xml.tag!('gmd:initiativeType') do
+                           codelistClass.writeXML('gmd', 'iso_initiativeType', s)
+                        end
+                     end
+                     if s.nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:initiativeType')
+                     end
 
-                        end # MD_AggregateInformation tag
-                    end # writeXML
-                end # MD_AggregateInformation class
+                  end # MD_AggregateInformation tag
+               end # writeXML
+            end # MD_AggregateInformation class
 
-            end
-        end
-    end
+         end
+      end
+   end
 end

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/{class_attributeGroup.rb → class_attribute.rb}

@@ -13,7 +13,7 @@ module ADIWG
       module Writers
          module Iso19115_2
 
-            class AttributeGroup
+            class Attribute
 
                def initialize(xml, hResponseObj)
                   @xml = xml

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_baseUnit.rb

@@ -5,34 +5,34 @@
 # 	Stan Smith 2015-08-27 copied from 19110 writer
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
 
-                class BaseUnit
+            class BaseUnit
 
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
 
-                    def writeXML(hBase)
+               def writeXML(hBase)
 
-                        # create and identity for the unit
-                        @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
-                        unitID = 'unit' + @hResponseObj[:writerMissingIdCount]
-                        @xml.tag!('gml:BaseUnit', {'gml:id' => unitID}) do
-                            @xml.tag!('gml:identifier', {'codeSpace' => hBase[:codeSpace]}, hBase[:identifier])
-                            @xml.tag!('gml:name', hBase[:name])
-                            @xml.tag!('gml:catalogSymbol', hBase[:catalogSymbol])
-                            @xml.tag!('gml:unitsSystem', {'xlink:href' => hBase[:unitsSystem]})
-                        end
+                  # create and identity for the unit
+                  @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
+                  unitID = 'unit' + @hResponseObj[:writerMissingIdCount]
+                  @xml.tag!('gml:BaseUnit', {'gml:id' => unitID}) do
+                     @xml.tag!('gml:identifier', {'codeSpace' => hBase[:codeSpace]}, hBase[:identifier])
+                     @xml.tag!('gml:name', hBase[:name])
+                     @xml.tag!('gml:catalogSymbol', hBase[:catalogSymbol])
+                     @xml.tag!('gml:unitsSystem', {'xlink:href' => hBase[:unitsSystem]})
+                  end
 
-                    end
-
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end