adiwg-mdtranslator 1.4.0 → 2.0.0rc2

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

@@ -1,17 +1,18 @@
 # ISO <<Class>> DQ_DataQuality
-# writer output in XML
+# 19115-2 writer output in XML
 
 # History:
-# 	Stan Smith 2013-11-20 original script
-#   Stan Smith 2014-07-09 modify require statements to function in RubyGem structure
+#   Stan Smith 2016-12-13 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 (responseObj)
+#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
 #   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
 #   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
-#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
-#   Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
-#   Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
+#   Stan Smith 2014-07-09 modify require statements to function in RubyGem structure
+# 	Stan Smith 2013-11-20 original script
 
-require_relative 'class_codelist'
+require_relative 'class_scope'
 require_relative 'class_lineage'
 
 module ADIWG
@@ -23,48 +24,38 @@ module ADIWG
 
                     def initialize(xml, responseObj)
                         @xml = xml
-                        @responseObj = responseObj
+                        @hResponseObj = responseObj
                     end
 
-                    def writeXML(hDataQ)
+                    def writeXML(hLineage)
 
                         # classes used
-                        codelistClass =  MD_Codelist.new(@xml, @responseObj)
-                        lineClass =  LI_Lineage.new(@xml, @responseObj)
+                        scopeClass =  DQ_Scope.new(@xml, @hResponseObj)
+                        lineClass =  LI_Lineage.new(@xml, @hResponseObj)
 
                         @xml.tag!('gmd:DQ_DataQuality') do
 
-                            # data quality - scope - required
-                            s = hDataQ[:dataScope]
-                            if s.nil?
-                                @xml.tag!('gmd:scope', {'gco:nilReason' => 'missing'})
-                            else
+                            # data quality - scope {DQ_Scope} (required)
+                            hScope = hLineage[:resourceScope]
+                            unless hScope.empty?
                                 @xml.tag!('gmd:scope') do
-                                    @xml.tag!('gmd:DQ_Scope') do
-                                        @xml.tag!('gmd:level') do
-                                            codelistClass.writeXML('iso_scope',s)
-                                        end
-                                    end
+                                    scopeClass.writeXML(hScope)
                                 end
                             end
+                            if hScope.empty?
+                                @xml.tag!('gmd:scope', {'gco:nilReason' => 'missing'})
+                            end
 
-                            # date quality - report
+                            # date quality - report (moved to ISO 19157)
 
                             # data quality - lineage
-                            hLineage = hDataQ[:dataLineage]
-                            if !hLineage.empty?
-                                @xml.tag!('gmd:lineage') do
-                                    lineClass.writeXML(hLineage)
-                                end
-                            elsif @responseObj[:writerShowTags]
-                                @xml.tag!('gmd:lineage')
+                            @xml.tag!('gmd:lineage') do
+                                lineClass.writeXML(hLineage)
                             end
 
-                        end
-
-                    end
-
-                end
+                        end # gmd:DQ_DataQuality tag
+                    end # writeXML
+                end # DQ_DataQuality class
 
             end
         end

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

@@ -1,17 +1,19 @@
 # ISO <<Class>> CI_Date
-# writer output in XML
+# 19115-2 writer output in XML
 
 # History:
-# 	Stan Smith 2013-08-26 original script
-# 	Stan Smith 2013-11-21 support for date or datetime
-#   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
-#   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
-#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
-#   Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
+#   Stan Smith 2016-11-29 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-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
+# 	Stan Smith 2013-11-21 support for date or datetime
+# 	Stan Smith 2013-08-26 original script
 
 require_relative 'class_codelist'
+require_relative 'class_gcoDateTime'
 
 module ADIWG
     module Mdtranslator
@@ -20,54 +22,45 @@ module ADIWG
 
                 class CI_Date
 
-                    def initialize(xml, responseObj)
+                    def initialize(xml, hResponseObj)
                         @xml = xml
-                        @responseObj = responseObj
+                        @hResponseObj = hResponseObj
                     end
 
                     def writeXML(hDate)
 
                         # classes used
-                        codelistClass =  MD_Codelist.new(@xml, @responseObj)
+                        codelistClass =  MD_Codelist.new(@xml, @hResponseObj)
+                        gcoDateTimeClass =  GcoDateTime.new(@xml, @hResponseObj)
 
-                        citDateTime = hDate[:dateTime]
-                        citDateRes = hDate[:dateResolution]
-                        citDateType = hDate[:dateType]
+                        date = hDate[:date]
+                        dateType = hDate[:dateType]
 
                         @xml.tag!('gmd:CI_Date') do
 
-                            # date - date - required
-                            if citDateTime.nil?
-                                @xml.tag!('gmd:date', {'gco:nilReason' => 'missing'})
-                            else
+                            # date - date (required)
+                            unless date.nil?
                                 @xml.tag!('gmd:date') do
-
-                                    if citDateRes.length > 3
-                                        # if time, requires all time fields
-                                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(citDateTime, 'YMDhmsZ')
-                                        @xml.tag!('gco:DateTime', dateStr)
-                                    else
-                                        dateStr = AdiwgDateTimeFun.stringDateFromDateTime(citDateTime, citDateRes)
-                                        @xml.tag!('gco:Date', dateStr)
-                                    end
-
+                                    gcoDateTimeClass.writeXML(hDate)
                                 end
-
+                            end
+                            if date.nil?
+                                @xml.tag!('gmd:date', {'gco:nilReason' => 'missing'})
                             end
 
-                            # date - date type - required
-                            if citDateType.nil?
-                                @xml.tag!('gmd:dateType', {'gco:nilReason' => 'missing'})
-                            else
+                            # date - date type (required)
+                            unless dateType.nil?
                                 @xml.tag!('gmd:dateType') do
-                                    codelistClass.writeXML('iso_dateType',citDateType)
+                                    codelistClass.writeXML('gmd', 'iso_dateType',dateType)
                                 end
                             end
-                        end
-
-                    end
+                            if dateType.nil?
+                                @xml.tag!('gmd:dateType', {'gco:nilReason' => 'missing'})
+                            end
 
-                end
+                        end # CI_Date tag
+                    end # write XML
+                end # CI_Date class
 
             end
         end

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

@@ -1,5 +1,5 @@
 # ISO <<Class>> UnitDefinition
-# writer output in XML
+# 19115-2 writer output in XML
 
 # History:
 # 	Stan Smith 2015-08-27 copied from 19110 writer
@@ -11,16 +11,16 @@ module ADIWG
 
                 class UnitDefinition
 
-                    def initialize(xml, responseObj)
+                    def initialize(xml, hResponseObj)
                         @xml = xml
-                        @responseObj = responseObj
+                        @hResponseObj = hResponseObj
                     end
 
                     def writeXML(unit)
 
                         # create an identity for the unit
-                        @responseObj[:writerMissingIdCount] = @responseObj[:writerMissingIdCount].succ
-                        unitID = 'unit' + @responseObj[:writerMissingIdCount]
+                        @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
+                        unitID = 'unit' + @hResponseObj[:writerMissingIdCount]
                         @xml.tag!('gml:UnitDefinition', {'gml:id' => unitID}) do
                             @xml.tag!('gml:identifier', {'codeSpace' => ''}, unit)
                         end

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

@@ -1,5 +1,5 @@
 # ISO <<Class>> DerivedUnit
-# writer output in XML
+# 19115-2 writer output in XML
 
 # History:
 # 	Stan Smith 2015-08-27 copied from 19110 writer
@@ -11,16 +11,16 @@ module ADIWG
 
                 class DerivedUnit
 
-                    def initialize(xml, responseObj)
+                    def initialize(xml, hResponseObj)
                         @xml = xml
-                        @responseObj = responseObj
+                        @hResponseObj = hResponseObj
                     end
 
                     def writeXML(hDerived)
 
                         # create and identity for the unit
-                        @responseObj[:writerMissingIdCount] = @responseObj[:writerMissingIdCount].succ
-                        unitID = 'unit' + @responseObj[:writerMissingIdCount]
+                        @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
+                        unitID = 'unit' + @hResponseObj[:writerMissingIdCount]
                         @xml.tag!('gml:DerivedUnit', {'gml:id' => unitID}) do
                             @xml.tag!('gml:identifier', {'codeSpace' => hDerived[:codeSpace]}, hDerived[:identifier])
                             @xml.tag!('gml:name', hDerived[:name])

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

@@ -1,10 +1,12 @@
 # ISO <<Class>> MD_Dimension
-# writer output in XML
+# 19115-2 writer output in XML
 
 # History:
+#   Stan Smith 2016-11-23 refactored for mdTranslator/mdJson 2.0
 # 	Stan Smith 2015-07-30 original script.
 
 require_relative 'class_codelist'
+require_relative 'class_measure'
 
 module ADIWG
     module Mdtranslator
@@ -13,54 +15,55 @@ module ADIWG
 
                 class MD_Dimension
 
-                    def initialize(xml, responseObj)
+                    def initialize(xml, hResponseObj)
                         @xml = xml
-                        @responseObj = responseObj
+                        @hResponseObj = hResponseObj
                     end
 
                     def writeXML(hDim)
 
                         # classes used
-                        codelistClass = MD_Codelist.new(@xml, @responseObj)
+                        codelistClass = MD_Codelist.new(@xml, @hResponseObj)
+                        measureClass = Measure.new(@xml, @hResponseObj)
 
                         @xml.tag!('gmd:MD_Dimension') do
 
-                            # dimension information - dimension type code - required
+                            # dimension information - dimension type code (required)
                             s = hDim[:dimensionType]
-                            if !s.nil?
+                            unless s.nil?
                                 @xml.tag!('gmd:dimensionName') do
-                                    codelistClass.writeXML('iso_dimensionNameType',s)
+                                    codelistClass.writeXML('gmd', 'iso_dimensionNameType',s)
                                 end
-                            else
+                            end
+                            if s.nil?
                                 @xml.tag!('gmd:dimensionName', {'gco:nilReason'=>'missing'})
                             end
 
-                            # dimension information - dimension size - required
+                            # dimension information - dimension size (required)
                             s = hDim[:dimensionSize]
-                            if !s.nil?
+                            unless s.nil?
                                 @xml.tag!('gmd:dimensionSize') do
                                     @xml.tag!('gco:Integer',s)
                                 end
-                            else
+                            end
+                            if s.nil?
                                 @xml.tag!('gmd:dimensionSize', {'gco:nilReason'=>'missing'})
                             end
 
-                            # dimension information - dimension resolution - required
-                            res = hDim[:resolution]
-                            resUnit = hDim[:resolutionUnits]
-                            if !res.nil?
+                            # dimension information - dimension resolution
+                            hMeasure = hDim[:resolution]
+                            unless hMeasure.empty?
                                 @xml.tag!('gmd:resolution') do
-                                    @xml.tag!('gco:Measure', {'uom'=>resUnit}, res)
+                                    measureClass.writeXML(hMeasure)
                                 end
-                            else
-                                @xml.tag!('gmd:resolution', {'gco:nilReason'=>'missing'})
+                            end
+                            if hMeasure.empty? && @hResponseObj[:writerShowTags]
+                                @xml.tag!('gmd:resolution')
                             end
 
-                        end
-
-                    end
-
-                end
+                        end # MD_Dimension tag
+                    end # writeXML
+                end # Md_Dimension class
 
             end
         end

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

@@ -1,13 +1,14 @@
 # ISO <<Class>> MD_Distribution
-# writer output in XML
+# 19115-2 writer output in XML
 
 # History:
-# 	Stan Smith 2013-09-25 original script
-#   Stan Smith 2014-07-09 modify require statements to function in RubyGem structure
-#   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
-#   Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
+#   Stan Smith 2016-12-07 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-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2014-07-09 modify require statements to function in RubyGem structure
+# 	Stan Smith 2013-09-25 original script
 
 require_relative 'class_distributor'
 
@@ -18,19 +19,20 @@ module ADIWG
 
                 class MD_Distribution
 
-                    def initialize(xml, responseObj)
+                    def initialize(xml, hResponseObj)
                         @xml = xml
-                        @responseObj = responseObj
+                        @hResponseObj = hResponseObj
                     end
 
-                    def writeXML(aDistributors)
+                    def writeXML(hDistribution)
 
                         # classes used
-                        distributorClass = MD_Distributor.new(@xml, @responseObj)
+                        distributorClass = MD_Distributor.new(@xml, @hResponseObj)
 
                         @xml.tag!('gmd:MD_Distribution') do
 
-                            # distribution - distributor - required
+                            # distribution - distributor (required)
+                            aDistributors = hDistribution[:distributor]
                             unless aDistributors.empty?
                                 aDistributors.each do |hDistributor|
                                     @xml.tag!('gmd:distributor') do
@@ -38,12 +40,13 @@ module ADIWG
                                     end
                                 end
                             end
+                            if aDistributors.empty? && @hResponseObj[:writerShowTags]
+                                @xml.tag!('gmd:distributor')
+                            end
 
-                        end
-
-                    end
-
-                end
+                        end # gmd:MD_Distribution tag
+                    end # writeXML
+                end # MD_Distribution class
 
             end
         end

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

@@ -1,19 +1,20 @@
 # ISO <<Class>> MD_Distributor
-# writer output in XML
+# 19115-2 writer output in XML
 
 # History:
-# 	Stan Smith 2013-09-25 original script
-#   Stan Smith 2014-07-09 modify require statements to function in RubyGem structure
-#   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
-#   Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
-#   Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
+#   Stan Smith 2016-12-07 refactored for mdTranslator/mdJson 2.0
 #   Stan Smith 2015-09-21 added format from distributorTransferOptions
+#   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-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2014-07-09 modify require statements to function in RubyGem structure
+# 	Stan Smith 2013-09-25 original script
 
 require_relative 'class_responsibleParty'
-require_relative 'class_standardOrderProcess'
+require_relative 'class_orderProcess'
 require_relative 'class_format'
-require_relative 'class_digitalTransferOptions'
+require_relative 'class_transferOptions'
 
 module ADIWG
     module Mdtranslator
@@ -22,90 +23,74 @@ module ADIWG
 
                 class MD_Distributor
 
-                    def initialize(xml, responseObj)
+                    def initialize(xml, hResponseObj)
                         @xml = xml
-                        @responseObj = responseObj
+                        @hResponseObj = hResponseObj
                     end
 
-                    def writeXML(distributor)
+                    def writeXML(hDistributor)
 
                         # classes used
-                        rPartyClass =  CI_ResponsibleParty.new(@xml, @responseObj)
-                        sOrderProcClass =  MD_StandardOrderProcess.new(@xml, @responseObj)
-                        rFormatClass =  MD_Format.new(@xml, @responseObj)
-                        dTranOptClass =  MD_DigitalTransferOptions.new(@xml, @responseObj)
+                        partyClass =  CI_ResponsibleParty.new(@xml, @hResponseObj)
+                        orderClass =  MD_StandardOrderProcess.new(@xml, @hResponseObj)
+                        formatClass =  MD_Format.new(@xml, @hResponseObj)
+                        transferClass =  MD_DigitalTransferOptions.new(@xml, @hResponseObj)
 
                         @xml.tag!('gmd:MD_Distributor') do
 
-                            # distributor - distributor contact - CI_ResponsibleParty - required
-                            hResParty = distributor[:distContact]
-                            if hResParty.empty?
-                                @xml.tag!('gmd:distributorContact', {'gco:nilReason' => 'missing'})
-                            else
+                            # distributor - contact (required) {CI_ResponsibleParty}
+                            role = 'distributor'
+                            hParty = hDistributor[:contact][:parties][0]
+                            unless hParty.nil?
                                 @xml.tag!('gmd:distributorContact') do
-                                    rPartyClass.writeXML(hResParty)
+                                    partyClass.writeXML(role, hParty)
                                 end
                             end
+                            if hParty.nil?
+                                @xml.tag!('gmd:distributorContact', {'gco:nilReason'=>'missing'})
+                            end
 
-                            # distributor - distribution order process []
-                            aDistOrderProc = distributor[:distOrderProcs]
-                            if !aDistOrderProc.empty?
-                                aDistOrderProc.each do |distOrder|
-                                    @xml.tag!('gmd:distributionOrderProcess') do
-                                        sOrderProcClass.writeXML(distOrder)
-                                    end
+                            # distributor - order process [{MD_StandardOrderProcess}]
+                            aDistOrderProc = hDistributor[:orderProcess]
+                            aDistOrderProc.each do |hOrder|
+                                @xml.tag!('gmd:distributionOrderProcess') do
+                                    orderClass.writeXML(hOrder)
                                 end
-                            elsif @responseObj[:writerShowTags]
+                            end
+                            if aDistOrderProc.empty? && @hResponseObj[:writerShowTags]
                                 @xml.tag!('gmd:distributionOrderProcess')
                             end
 
-                            # distributor - distributor format [] - deprecated
-                            # ... remove mdJson version 2.x
-                            # ... formats associated with a distributor
-                            aDistFormats = distributor[:distFormats]
-                            if !aDistFormats.empty?
-                                aDistFormats.each do |hFormat|
+                            # distributor - format [{MD_Format}]
+                            format = false
+                            aOptions = hDistributor[:transferOptions]
+                            aOptions.each do |hOption|
+                                aFormats = hOption[:distributionFormats]
+                                aFormats.each do |hFormat|
+                                    format = true
                                     @xml.tag!('gmd:distributorFormat') do
-                                        rFormatClass.writeXML(hFormat)
+                                        formatClass.writeXML(hFormat)
                                     end
                                 end
-                            elsif @responseObj[:writerShowTags]
+                            end
+                            if !format && @hResponseObj[:writerShowTags]
                                 @xml.tag!('gmd:distributorFormat')
                             end
 
-                            # distributor - distributor format [] -
-                            # ... formats associated with a distributor transfer options
-                            aDistTransOpts = distributor[:distTransOptions]
-                            if !aDistTransOpts.empty?
-                                aDistTransOpts.each do |hTransOpt|
-                                    aDistFormats = hTransOpt[:distFormats]
-                                    if !aDistFormats.empty?
-                                        aDistFormats.each do |hFormat|
-                                            @xml.tag!('gmd:distributorFormat') do
-                                                rFormatClass.writeXML(hFormat)
-                                            end
-                                        end
-                                    end
+                            # distributor - transfer options [{MD_DigitalTransferOptions}]
+                            aOptions = hDistributor[:transferOptions]
+                            aOptions.each do |hOption|
+                                @xml.tag!('gmd:distributorTransferOptions') do
+                                    transferClass.writeXML(hOption)
                                 end
                             end
-
-                            # distributor - distributor transfer options []
-                            aDistTransOpts = distributor[:distTransOptions]
-                            if !aDistTransOpts.empty?
-                                aDistTransOpts.each do |hTransOpt|
-                                    @xml.tag!('gmd:distributorTransferOptions') do
-                                        dTranOptClass.writeXML(hTransOpt)
-                                    end
-                                end
-                            elsif @responseObj[:writerShowTags]
+                            if aOptions.empty? && @hResponseObj[:writerShowTags]
                                 @xml.tag!('gmd:distributorTransferOptions')
                             end
 
-                        end
-
-                    end
-
-                end
+                        end # gmd:MD_Distributor tag
+                    end # writeXML
+                end # MD_Distributor class
 
             end
         end

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

@@ -1,15 +1,16 @@
 # ISO <<CodeLists>> Enumerations
+# 19115-2 writer output in XML
 
-# from http://mdtranslator.adiwg.org/api/codelists?format=xml
 # History:
-# 	Stan Smith 2013-08-09 original script
-#   Stan Smith 2014-10-15 allow non-ISO codesNames to be rendered
-#   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
-#   Stan Smith 2014-12-15 replaced NOAA CT_CodelistCatalogue with mdTranslator CT_CodelistCatalogue
-#   Stan Smith 2015-06-12 refactored to use mdCodes gem for codelist contents
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
-#   Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
+#   Stan Smith 2016-12-12 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 (responseObj)
+#   Stan Smith 2015-06-12 refactored to use mdCodes gem for codelist contents
+#   Stan Smith 2014-12-15 replaced NOAA CT_CodelistCatalogue with mdTranslator CT_CodelistCatalogue
+#   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2014-10-15 allow non-ISO codesNames to be rendered
+# 	Stan Smith 2013-08-09 original script
 
 require 'adiwg-mdcodes'
 
@@ -22,7 +23,7 @@ module ADIWG
 
                     def initialize(xml, responseObj)
                         @xml = xml
-                        @responseObj = responseObj
+                        @hResponseObj = responseObj
                     end
 
                     def writeXML(codeList, codeName)
@@ -42,9 +43,8 @@ module ADIWG
                             end
                         end
 
-                    end
-
-                end
+                    end # writeXML
+                end # MD_EnumerationList class
 
             end
         end