adiwg-mdtranslator 2.8.0 → 2.9.0

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

@@ -5,6 +5,8 @@
 #  Stan Smith 2017-04-05 refactored for mdTranslator 2.0
 # 	Stan Smith 2015-03-26 original script
 
+require_relative 'html_citation'
+
 module ADIWG
    module Mdtranslator
       module Writers
@@ -18,21 +20,24 @@ module ADIWG
 
                def writeHtml(hItem)
 
-                  # domain member - common name
+                  # classes used
+                  citationClass = Html_Citation.new(@html)
+
+                  # domain item - common name
                   unless hItem[:itemName].nil?
                      @html.em('Name: ')
                      @html.text!(hItem[:itemName])
                      @html.br
                   end
 
-                  # domain member - value
+                  # domain item - value
                   unless hItem[:itemValue].nil?
                      @html.em('Value: ')
                      @html.text!(hItem[:itemValue])
                      @html.br
                   end
 
-                  # domain member - definition
+                  # domain item - definition
                   unless hItem[:itemDefinition].nil?
                      @html.em('Definition: ')
                      @html.section(:class => 'block') do
@@ -40,6 +45,16 @@ module ADIWG
                      end
                   end
 
+                  # domain item - reference {citation}
+                  unless hItem[:itemReference].empty?
+                     @html.details do
+                        @html.summary('Reference', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           citationClass.writeHtml(hItem[:itemReference])
+                        end
+                     end
+                  end
+
                end # writeHtml
             end # Html_DomainItem
 

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

@@ -2,6 +2,7 @@
 # metadata information section
 
 # History:
+#  Stan Smith 2018-01-27 add metadata constraints
 #  Stan Smith 2017-03-23 refactored for mdTranslator 2.0
 #  Stan Smith 2015-07-16 refactored to remove global namespace $HtmlNS
 #  Stan Smith 2016-06-12 added metadata character set
@@ -13,6 +14,7 @@ require_relative 'html_locale'
 require_relative 'html_responsibility'
 require_relative 'html_date'
 require_relative 'html_onlineResource'
+require_relative 'html_constraint'
 require_relative 'html_maintenance'
 
 module ADIWG
@@ -35,6 +37,7 @@ module ADIWG
                   responsibilityClass = Html_Responsibility.new(@html)
                   dateClass = Html_Date.new(@html)
                   onlineClass = Html_OnlineResource.new(@html)
+                  constraintClass = Html_Constraint.new(@html)
                   maintClass = Html_Maintenance.new(@html)
 
                   # metadataInfo - metadata status
@@ -142,6 +145,23 @@ module ADIWG
                      end
                   end
 
+                  # metadataInfo - constraints [] {constraint}
+                  unless hMetaInfo[:metadataConstraints].empty?
+                     @html.details do
+                        @html.summary('Metadata Constraints', {'id' => 'metadataInfo-constraint', 'class' => 'h3'})
+                        @html.section(:class => 'block') do
+                           hMetaInfo[:metadataConstraints].each do |hConstraint|
+                              @html.details do
+                                 @html.summary(hConstraint[:type].capitalize+' Constraint', {'class' => 'h5'})
+                                 @html.section(:class => 'block') do
+                                    constraintClass.writeHtml(hConstraint)
+                                 end
+                              end
+                           end
+                        end
+                     end
+                  end
+
                   # metadataInfo - maintenance {maintenance}
                   unless hMetaInfo[:metadataMaintenance].empty?
                      @html.details do

data/lib/adiwg/mdtranslator/writers/iso19110/classes/class_fcFeatureCatalogue.rb

@@ -168,7 +168,7 @@ module ADIWG
                      end
 
                      # feature catalogue - functional language
-                     s = hDictionary[:dictionaryFormat]
+                     s = hDictionary[:dictionaryFunctionalLanguage]
                      unless s.nil?
                         @xml.tag!('gfc:functionalLanguage') do
                            @xml.tag!('gco:CharacterString', s)

data/lib/adiwg/mdtranslator/writers/iso19110/classes/class_listedValue.rb

@@ -2,7 +2,10 @@
 # writer output in XML
 # to define the domain of an attribute
 
+require_relative 'class_definitionReference'
+
 # History:
+#  Stan Smith 2018-01-25 add support for domain itemReference
 #  Stan Smith 2017-02-03 refactored for mdJson/mdTranslator 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
@@ -24,6 +27,9 @@ module ADIWG
 
                def writeXML(hItem)
 
+                  # classes used
+                  defRefClass = FC_DefinitionReference.new(@xml, @hResponseObj)
+
                   @xml.tag!('gfc:FC_ListedValue') do
 
                      # listed value - label (required)
@@ -61,6 +67,14 @@ module ADIWG
                         @xml.tag!('gfc:definition')
                      end
 
+                     # listed value - definition reference
+                     unless hItem[:itemReference].empty?
+                        hCitation = hItem[:itemReference]
+                        @xml.tag!('gfc:definitionReference') do
+                           defRefClass.writeXML(hCitation)
+                        end
+                     end
+
                   end # gfc:FC_ListedValue tag
                end # writeXML
             end # FC_ListedValue class

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

@@ -55,7 +55,7 @@ module ADIWG
                   @hResponseObj = hResponseObj
                end
 
-               def writeXML(hData, aAssocRes)
+               def writeXML(hData, aAssocRes, aDistInfo)
 
                   # classes used
                   codelistClass = MD_Codelist.new(@xml, @hResponseObj)
@@ -204,6 +204,7 @@ module ADIWG
                      end
 
                      # data identification - resource constraints {}
+                     haveCon = false
                      aCons = hData[:constraints]
                      aCons.each do |hCon|
                         @xml.tag!('gmd:resourceConstraints') do
@@ -217,9 +218,27 @@ module ADIWG
                            if type == 'security'
                               sConClass.writeXML(hCon)
                            end
+                           haveCon = true
                         end
                      end
-                     if aCons.nil? && @hResponseObj[:writerShowTags]
+
+                     # data identification - resource constraints {}  from distribution liability statement
+                     aDistInfo.each do |hDistribution|
+                        unless hDistribution.empty?
+                           unless hDistribution[:liabilityStatement].nil?
+                              @xml.tag!('gmd:resourceConstraints') do
+                                 @xml.tag!('gmd:MD_LegalConstraints') do
+                                    @xml.tag!('gmd:otherConstraints') do
+                                       @xml.tag!('gco:CharacterString', hDistribution[:liabilityStatement])
+                                    end
+                                 end
+                              end
+                              haveCon = true
+                           end
+                        end
+                     end
+
+                     if !haveCon && @hResponseObj[:writerShowTags]
                         @xml.tag!('gmd:resourceConstraints')
                      end
 

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

@@ -2,53 +2,53 @@
 # 19115-2 writer output in XML
 
 # History:
-#   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 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'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class MD_Distribution
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hDistribution)
-
-                        # classes used
-                        distributorClass = MD_Distributor.new(@xml, @hResponseObj)
-
-                        @xml.tag!('gmd:MD_Distribution') do
-
-                            # distribution - distributor (required)
-                            aDistributors = hDistribution[:distributor]
-                            unless aDistributors.empty?
-                                aDistributors.each do |hDistributor|
-                                    @xml.tag!('gmd:distributor') do
-                                        distributorClass.writeXML(hDistributor)
-                                    end
-                                end
-                            end
-                            if aDistributors.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:distributor')
-                            end
-
-                        end # gmd:MD_Distribution tag
-                    end # writeXML
-                end # MD_Distribution class
-
-            end
-        end
-    end
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class MD_Distribution
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hDistribution)
+
+                  # classes used
+                  distributorClass = MD_Distributor.new(@xml, @hResponseObj)
+
+                  @xml.tag!('gmd:MD_Distribution') do
+
+                     # distribution - distributor (required)
+                     aDistributors = hDistribution[:distributor]
+                     unless aDistributors.empty?
+                        aDistributors.each do |hDistributor|
+                           @xml.tag!('gmd:distributor') do
+                              distributorClass.writeXML(hDistributor)
+                           end
+                        end
+                     end
+                     if aDistributors.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:distributor')
+                     end
+
+                  end # gmd:MD_Distribution tag
+               end # writeXML
+            end # MD_Distribution class
+
+         end
+      end
+   end
 end

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

@@ -2,87 +2,88 @@
 # 19115-2 writer output in XML
 
 # History:
-#   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 (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 2018-01-29 add legal constraint for distribution liability statement
+#  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 (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-01 original script.
 
 require_relative 'class_codelist'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
 
-                class MD_LegalConstraints
+            class MD_LegalConstraints
 
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
 
-                    def writeXML(hConstraint)
+               def writeXML(hConstraint)
 
-                        # classes used
-                        codelistClass = MD_Codelist.new(@xml, @hResponseObj)
+                  # classes used
+                  codelistClass = MD_Codelist.new(@xml, @hResponseObj)
 
-                        @xml.tag!('gmd:MD_LegalConstraints') do
+                  @xml.tag!('gmd:MD_LegalConstraints') do
 
-                            # constraints - use limitation []
-                            aUse = hConstraint[:useLimitation]
-                            aUse.each do |useCon|
-                                @xml.tag!('gmd:useLimitation') do
-                                    @xml.tag!('gco:CharacterString', useCon)
-                                end
-                            end
-                            if aUse.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:useLimitation')
-                            end
+                     # constraints - use limitation []
+                     aUse = hConstraint[:useLimitation]
+                     aUse.each do |useCon|
+                        @xml.tag!('gmd:useLimitation') do
+                           @xml.tag!('gco:CharacterString', useCon)
+                        end
+                     end
+                     if aUse.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:useLimitation')
+                     end
 
-                            hLegalCon = hConstraint[:legalConstraint]
+                     hLegalCon = hConstraint[:legalConstraint]
 
-                            # legal constraints - access constraints
-                            aAccess = hLegalCon[:accessCodes]
-                            aAccess.each do |code|
-                                @xml.tag!('gmd:accessConstraints') do
-                                    codelistClass.writeXML('gmd', 'iso_restriction',code)
-                                end
-                            end
-                            if aAccess.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:accessConstraints')
-                            end
+                     # legal constraints - access constraints
+                     aAccess = hLegalCon[:accessCodes]
+                     aAccess.each do |code|
+                        @xml.tag!('gmd:accessConstraints') do
+                           codelistClass.writeXML('gmd', 'iso_restriction', code)
+                        end
+                     end
+                     if aAccess.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:accessConstraints')
+                     end
 
-                            # legal constraints - use constraints
-                            aUse = hLegalCon[:useCodes]
-                            aUse.each do |code|
-                                @xml.tag!('gmd:useConstraints') do
-                                    codelistClass.writeXML('gmd', 'iso_restriction',code)
-                                end
-                            end
-                            if aUse.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:useConstraints')
-                            end
+                     # legal constraints - use constraints
+                     aUse = hLegalCon[:useCodes]
+                     aUse.each do |code|
+                        @xml.tag!('gmd:useConstraints') do
+                           codelistClass.writeXML('gmd', 'iso_restriction', code)
+                        end
+                     end
+                     if aUse.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:useConstraints')
+                     end
 
-                            # legal constraints - other constraints
-                            aOther = hLegalCon[:otherCons]
-                            aOther.each do |con|
-                                @xml.tag!('gmd:otherConstraints') do
-                                    @xml.tag!('gco:CharacterString', con)
-                                end
-                            end
-                            if aOther.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:otherConstraints')
-                            end
+                     # legal constraints - other constraints
+                     aOther = hLegalCon[:otherCons]
+                     aOther.each do |con|
+                        @xml.tag!('gmd:otherConstraints') do
+                           @xml.tag!('gco:CharacterString', con)
+                        end
+                     end
+                     if aOther.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:otherConstraints')
+                     end
 
-                        end # gmd:MD_LegalConstraints tag
-                    end # writeXML
-                end # MD_LegalConstraints class
+                  end # gmd:MD_LegalConstraints tag
+               end # writeXML
+            end # MD_LegalConstraints class
 
-            end
-        end
-    end
+         end
+      end
+   end
 end

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

@@ -1,64 +1,63 @@
-
 # ISO <<Class>> MD_Identifier
 # 19115-2 output for ISO 19115-2 XML
 
 # History:
-#   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 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 2014-05-28 revised for json schema 0.5.0
+#  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 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 2014-05-28 revised for json schema 0.5.0
 # 	Stan Smith 2014-05-16 original script
 
 require_relative 'class_citation'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class MD_Identifier
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hIdentifier)
-
-                        # classes used in MD_Metadata
-                        citationClass = CI_Citation.new(@xml, @hResponseObj)
-
-                        @xml.tag!('gmd:MD_Identifier') do
-
-                            # identifier - authority
-                            hCitation = hIdentifier[:citation]
-                            unless hCitation.empty?
-                                @xml.tag!('gmd:authority') do
-                                    citationClass.writeXML(hCitation)
-                                end
-                            end
-                            if hCitation.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:authority')
-                            end
-
-                            # identifier - code (required)
-                            s = hIdentifier[:identifier]
-                            if s.nil?
-                                @xml.tag!('gmd:code', {'gco:nilReason' => 'missing'})
-                            else
-                                @xml.tag!('gmd:code') do
-                                    @xml.tag!('gco:CharacterString', s)
-                                end
-                            end
-
-                        end # MD_Identifier tag
-                    end # writeXML
-                end # MD_Identifier class
-
-            end
-        end
-    end
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class MD_Identifier
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hIdentifier)
+
+                  # classes used in MD_Metadata
+                  citationClass = CI_Citation.new(@xml, @hResponseObj)
+
+                  @xml.tag!('gmd:MD_Identifier') do
+
+                     # identifier - authority
+                     hCitation = hIdentifier[:citation]
+                     unless hCitation.empty?
+                        @xml.tag!('gmd:authority') do
+                           citationClass.writeXML(hCitation)
+                        end
+                     end
+                     if hCitation.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:authority')
+                     end
+
+                     # identifier - code (required)
+                     s = hIdentifier[:identifier]
+                     if s.nil?
+                        @xml.tag!('gmd:code', {'gco:nilReason' => 'missing'})
+                     else
+                        @xml.tag!('gmd:code') do
+                           @xml.tag!('gco:CharacterString', s)
+                        end
+                     end
+
+                  end # MD_Identifier tag
+               end # writeXML
+            end # MD_Identifier class
+
+         end
+      end
+   end
 end