adiwg-mdtranslator 2.19.0.pre.beta.31 → 2.20.0.pre.beta.3

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

@@ -185,13 +185,6 @@ module ADIWG
                       end
                     end
                   end
-
-                  # Name
-                  unless result[:name].nil?
-                    @html.em('Name: ')
-                    @html.text!(result[:name])
-                    @html.br
-                  end
             
                   # Specification (citation)
                   unless result[:specification].empty?
@@ -249,13 +242,6 @@ module ADIWG
                     end
                   end
             
-                  # Name
-                  unless result[:name].nil?
-                    @html.em('Name: ')
-                    @html.text!(result[:name])
-                    @html.br
-                  end
-            
                   # SpatialRepresentationType
                   unless result[:spatialRepresentationType].nil?
                     @html.em('Spatial Representation Type: ')
@@ -331,13 +317,6 @@ module ADIWG
                       end
                     end
                   end
-
-                  # Name
-                  unless result[:name].nil?
-                    @html.em('Name: ')
-                    @html.text!(result[:name])
-                    @html.br
-                  end
             
                   # Statement
                   unless result[:statement].nil?
@@ -373,13 +352,6 @@ module ADIWG
                       end
                     end
                   end
-
-                  # Name
-                  unless result[:name].nil?
-                    @html.em('Name: ')
-                    @html.text!(result[:name])
-                    @html.br
-                  end
             
                   # Value
                   unless result[:values].empty?

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

@@ -277,33 +277,6 @@ module ADIWG
 
                      # data identification - resource constraints [] {MD_Constraints}
                      aConstraint = hResource[:constraints]
-                     legalConstraint = aConstraint.find { |hCon| hCon[:type] == 'legal' }
-                     # handle distribution liability statements - add to legal constraint -> other constraints
-                     aDistInfo = hMetadata[:distributorInfo]
-                     liabilityStatements = []
-                     aDistInfo.each do |hDistribution|
-                        unless hDistribution.empty?
-                           unless hDistribution[:liabilityStatement].nil?
-                              liabilityStatements << hDistribution[:liabilityStatement]
-                           end
-                        end
-                     end
-                     if liabilityStatements.any?
-                        # Create a new legal constraint if it doesn't exist
-                        unless legalConstraint
-                           legalConstraint = {
-                              type: 'legal',
-                              legalConstraint: {
-                                 otherCons: []
-                              }
-                           }
-                           aConstraint << legalConstraint
-                        end
-                        liabilityStatements.each do |liabilityStatement|
-                           legalConstraint[:legalConstraint][:otherCons] << liabilityStatement
-                        end
-                     end
-
                      aConstraint.each do |hCon|
                         @xml.tag!('mri:resourceConstraints') do
                            constraintClass.writeXML(hCon, 'resource information')
@@ -313,8 +286,6 @@ module ADIWG
                         @xml.tag!('mri:resourceConstraints')
                      end
 
-                     # data identification - resource constraints {}  from distribution liability statement
-
                      # data identification - associated resource [] {MD_AssociatedResource}
                      aAssocRes.each do |hAssocRes|
                         @xml.tag!('mri:associatedResource') do

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_dataQualityReport.rb

@@ -34,7 +34,7 @@ module ADIWG
             citationClass = CI_Citation.new(@xml, @hResponseObj)
 
             @xml.tag!('mdq:report') do
-              @xml.tag!("mdq:#{hReport[:type]}") do
+              @xml.tag!("mdq:DQ_#{hReport[:type]}") do
 
                 # standaloneQualityReportDetails
                 unless hReport[:standaloneQualityReportDetails].nil?

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_gcoDateTime.rb

@@ -24,16 +24,7 @@ module ADIWG
                   # date - date (required)
                   unless date.nil?
                      case dateRes
-                        when 'Y'
-                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, 'Y')
-                           @xml.tag!('gco:Date', dateStr)
-                        when 'YM'
-                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, 'YM')
-                           @xml.tag!('gco:Date', dateStr)
-                        when 'YMD'
-                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, 'YMD')
-                           @xml.tag!('gco:Date', dateStr)
-                        when 'YMDh', 'YMDhm', 'YMDhms'
+                        when 'Y', 'YM', 'YMD', 'YMDh', 'YMDhm', 'YMDhms'
                            dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, 'YMDhms')
                            @xml.tag!('gco:DateTime', dateStr)
                         when 'YMDhZ', 'YMDhmZ', 'YMDhmsZ'

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_mdMetadata.rb

@@ -26,7 +26,6 @@ require_relative 'class_maintenance'
 require_relative 'class_spatialRepresentation'
 require_relative 'class_referenceSystem'
 require_relative 'class_featureCatalog'
-require_relative 'class_extension'
 
 module ADIWG
    module Mdtranslator
@@ -63,7 +62,6 @@ module ADIWG
                   representationClass = SpatialRepresentation.new(@xml, @hResponseObj)
                   referenceSystemClass = MD_ReferenceSystem.new(@xml, @hResponseObj)
                   mdCatalogClass = MD_FeatureCatalogue.new(@xml, @hResponseObj)
-                  extensionClass = MD_MetadataExtensionInformation.new(@xml, @hResponseObj)
 
                   # create shortcuts to sections of internal object
                   hMetadata = intObj[:metadata]
@@ -293,31 +291,6 @@ module ADIWG
                         @xml.tag!('mdb:referenceSystemInfo')
                      end
 
-                     taxonomyArray = hResInfo[:taxonomy]
-                     unless taxonomyArray.empty?
-                        # metadata information - metadata extension info
-                        # add biological profile to all metadata records
-                        intBio = intMetadataClass.newMetadataExtension
-                        intBio[:name] = 'Taxonomy System'
-                        intBio[:shortName] = 'TaxonSys'
-                        intBio[:definition] = 'Documentation of taxonomic sources, procedures, and treatments'
-                        intBio[:obligation] = 'optional'
-                        intBio[:dataType] = 'class'
-                        intBio[:maxOccurrence] = '1'
-                        intBio[:parentEntities] << 'MD_Identification'
-                        intBio[:rule] = 'New Metadata section as a class to MD_Identification'
-                        intBio[:rationales] << 'The set of data elements contained within this class element ' +
-                           'represents an attempt to provide better documentation of ' +
-                           'taxonomic sources, procedures, and treatments.'
-                        intBio[:sourceOrganization] = 'National Biological Information Infrastructure'
-                        intBio[:sourceURI] = 'https://www2.usgs.gov/core_science_systems/Access/p1111-1.html'
-                        intBio[:sourceRole] = 'author'
-
-                        @xml.tag!('gmd:metadataExtensionInfo') do
-                           extensionClass.writeXML(intBio)
-                        end
-                     end
-
                      # ###################### Begin Data Identification #####################
 
                      # metadata information - data identification info - required

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_timePeriod.rb

@@ -65,7 +65,9 @@ module ADIWG
                      # if empty add indeterminatePosition="unknown"
                      unless hPeriod[:startDateTime].empty?
                         hDateTime = hPeriod[:startDateTime]
-                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateObject(hDateTime)
+                        dateTime = hDateTime[:dateTime]
+                        timeResolution = hDateTime[:dateResolution]
+                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(dateTime, timeResolution)
                         @xml.tag!('gml:beginPosition', dateStr)
                      end
                      if hPeriod[:startDateTime].empty?
@@ -77,7 +79,9 @@ module ADIWG
                      # if empty add indeterminatePosition="unknown"
                      unless hPeriod[:endDateTime].empty?
                         hDateTime = hPeriod[:endDateTime]
-                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateObject(hDateTime)
+                        dateTime = hDateTime[:dateTime]
+                        timeResolution = hDateTime[:dateResolution]
+                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(dateTime, timeResolution)
                         @xml.tag!('gml:endPosition', dateStr)
                      end
                      if hPeriod[:endDateTime].empty?

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_conformanceResult.rb

@@ -10,12 +10,11 @@ module ADIWG
         module ConformanceResult
           def self.build(hConformanceResult)
             Jbuilder.new do |json|
-              json.dateTime hConformanceResult[:dateTime] unless hConformanceResult[:dateTime].nil?
-              json.scope Scope.build(hConformanceResult[:scope]) unless hConformanceResult[:scope].empty?
-              json.name hConformanceResult[:name] unless hConformanceResult[:name].nil?
-              json.specification Citation.build(hConformanceResult[:specification]) unless hConformanceResult[:specification].empty?
-              json.explanation hConformanceResult[:explanation] unless hConformanceResult[:explanation].nil?
-              json.pass hConformanceResult[:pass] unless hConformanceResult[:pass].nil?
+              json.dateTime hConformanceResult[:dateTime]
+              json.scope Scope.build(hConformanceResult[:scope])
+              json.specification Citation.build(hConformanceResult[:specification])
+              json.explanation hConformanceResult[:explanation]
+              json.pass hConformanceResult[:pass]
             end
           end
         end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_coverageResult.rb

@@ -15,7 +15,6 @@ module ADIWG
             Jbuilder.new do |json|
                 json.dateTime hCoverageResult[:dateTime]
                 json.scope Scope.build(hCoverageResult[:scope]) unless hCoverageResult[:scope].empty?
-                json.name hCoverageResult[:name] unless hCoverageResult[:name].nil?
                 json.spatialRepresentationType hCoverageResult[:spatialRepresentationType]
                 json.spatialRepresentation SpatialRepresentation.build(hCoverageResult[:spatialRepresentation]) unless hCoverageResult[:spatialRepresentation].empty?
                 json.resultContentDescription CoverageDescription.build(hCoverageResult[:resultContentDescription]) unless hCoverageResult[:resultContentDescription].empty?

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_descriptiveResult.rb

@@ -11,7 +11,6 @@ module ADIWG
             Jbuilder.new do |json|
               json.dateTime hResult[:dateTime] unless hResult[:dateTime].nil?
               json.scope Scope.build(hResult[:scope]) unless hResult[:scope].empty?
-              json.name hResult[:name] unless hResult[:name].nil?
               json.statement hResult[:statement] unless hResult[:statement].nil?
             end
           end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_onlineResource.rb

@@ -19,10 +19,10 @@ module ADIWG
                   Jbuilder.new do |json|
                      json.uri hOlRes[:olResURI]
                      json.name hOlRes[:olResName]
-                     json.protocol hOlRes[:olResProtocol]
                      json.description hOlRes[:olResDesc]
                      json.function hOlRes[:olResFunction]
                      json.applicationProfile hOlRes[:olResApplicationProfile]
+                     json.protocol hOlRes[:olResProtocol]
                      json.protocolRequest hOlRes[:olResProtocolRequest]
                   end
 

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_quantitativeResult.rb

@@ -9,12 +9,11 @@ module ADIWG
         module QuantitativeResult
           def self.build(hResult)
             Jbuilder.new do |json|
-              json.dateTime hResult[:dateTime] unless hResult[:dateTime].nil?
-              json.scope Scope.build(hResult[:scope]) unless hResult[:scope].empty?
-              json.name hResult[:name] unless hResult[:name].nil?
-              json.value hResult[:values] unless hResult[:values].empty?
-              json.valueUnits hResult[:valueUnits] unless hResult[:valueUnits].nil?
-              json.valueRecordType hResult[:valueRecordType] unless hResult[:valueRecordType].nil?
+              json.dateTime hResult[:dateTime]
+              json.scope Scope.build(hResult[:scope]) if hResult[:scope]
+              json.value hResult[:values]
+              json.valueUnits hResult[:valueUnits]
+              json.valueRecordType hResult[:valueRecordType]
             end
           end
         end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_resourceInfo.rb

@@ -42,8 +42,8 @@ module ADIWG
                      json.abstract hResInfo[:abstract]
                      json.shortAbstract hResInfo[:shortAbstract]
                      json.purpose hResInfo[:purpose]
-                     json.timePeriod TimePeriod.build(hResInfo[:timePeriod]) unless hResInfo[:timePeriod].empty?
                      json.credit hResInfo[:credits] unless hResInfo[:credits].empty?
+                     json.timePeriod TimePeriod.build(hResInfo[:timePeriod]) unless hResInfo[:timePeriod].empty?
                      json.status hResInfo[:status] unless hResInfo[:status].empty?
                      json.pointOfContact @Namespace.json_map(hResInfo[:pointOfContacts], ResponsibleParty)
                      json.spatialReferenceSystem @Namespace.json_map(hResInfo[:spatialReferenceSystems], SpatialReference)

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_citation.rb

@@ -12,15 +12,15 @@ module ADIWG
 
             module Citation
 
+               # build from citation as follows ...
+               # names, [] {citation.responsibleParty[]}
+               # dates(type), [] {citation.dates[]}
+               # title, {citation.title}
+               # uri, [] {citation.onlineResource[]}
                def self.build(hCitation)
 
                   citation = ''
 
-                  if hCitation[:otherDetails].length > 0
-                     citation = hCitation[:otherDetails][0]
-                     return citation
-                  end
-
                   # names
                   aParties = []
                   hCitation[:responsibleParties].each do |hResponsibility|
@@ -45,15 +45,32 @@ module ADIWG
                         unless hContact[:name].nil?
                            sbRole = Codelists.codelist_adiwg2sb('role_adiwg2sb', hParty[:role])
                            sbRole = sbRole.nil? ? hParty[:role] : sbRole
-                           if sbRole.downcase == 'author'
-                              citation += hContact[:name] + ', '
-                           end
+                           citation += hContact[:name] + '(' + sbRole + '), '
                         end
                      end
                   end
 
+                  # dates
+                  hCitation[:dates].each do |hDate|
+                     dateStr = AdiwgDateTimeFun.stringDateFromDateObject(hDate)
+                     dateType = Codelists.codelist_adiwg2sb('date_adiwg2sb', hDate[:dateType])
+                     unless dateType.nil?
+                        citation += dateStr + '(' + dateType + '), '
+                     end
+                  end
+
                   # title
-                  citation += hCitation[:title]
+                  citation += hCitation[:title] + ', '
+
+                  # uri
+                  hCitation[:onlineResources].each do |hOnline|
+                     citation += hOnline[:olResURI] + ', '
+                  end
+
+                  # clean off last comma
+                  if citation.length > 0
+                     citation = citation[0...-2]
+                  end
 
                   citation
 

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_allocation.rb

@@ -90,7 +90,7 @@ module ADIWG
                   # allocation - online resource [] {onlineResource}
                   hAllocation[:onlineResources].each do |hOnline|
                      @html.div do
-                        @html.h5('Online Resource', {'class' => 'h5'})
+                        @html.div('Online Resource', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            onlineClass.writeHtml(hOnline)
                         end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_citation.rb

@@ -147,14 +147,14 @@ module ADIWG
                      end
                   end
 
-                  # citation - other details []
-                  unless hCitation[:otherDetails].empty?
-                     hCitation[:otherDetails].each do |detail|
-                        @html.em('Other Details: ')
-                        @html.text!(detail)
-                        @html.br
-                     end
-                  end
+                  # citation - other div []
+                  # unless hCitation[:otherdiv].empty?
+                  #    hCitation[:otherdiv].each do |detail|
+                  #       @html.em('Other div: ')
+                  #       @html.text!(detail)
+                  #       @html.br
+                  #    end
+                  # end
 
                end # writeHtml
             end # Html_Citation

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_dataQuality.rb

@@ -62,7 +62,7 @@ module ADIWG
                   hDataQuality[:report].each do |report|
                     @html.div(:class =>'block') do
                       @html.div do
-                        @html.h5(report[:type], {'class' => 'h5'})
+                        @html.h5('Report', {'class' => 'h5'})
                         dataQualityReportClass.writeHtml(report)
                       end
                     end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_dataQualityReport.rb

@@ -262,7 +262,7 @@ module ADIWG
                   # ResultContentDescription
                   unless result[:resultContentDescription].empty?
                     @html.div do
-                      @html.h5('Result Content Description', {'class' => 'h5'})
+                      @html.div('Result Content Description', {'class' => 'h5'})
                       @html.div(:class => 'block') do
                         coverageInfoClass.writeHtml(result[:resultContentDescription])
                       end
@@ -272,7 +272,7 @@ module ADIWG
                   # ResourceFormat
                   unless result[:resourceFormat].empty?
                     @html.div do
-                      @html.h5('Resource Format', {'class' => 'h5'})
+                      @html.div('Resource Format', {'class' => 'h5'})
                       @html.div(:class => 'block') do
                         formatClass.writeHtml(result[:resourceFormat])
                       end
@@ -282,7 +282,7 @@ module ADIWG
                   # ResultFile
                   unless result[:resultFile].empty?
                     @html.div do
-                      @html.h5('Result File', {'class' => 'h5'})
+                      @html.div('Result File', {'class' => 'h5'})
                       @html.div(:class => 'block') do
                         resultFileClass.writeHtml(result[:resultFile])
                       end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_geographicExtent.rb

@@ -82,7 +82,7 @@ module ADIWG
                   # geographic extent - identifier {identifier}
                   unless hExtent[:identifier].empty?
                      @html.div do
-                        @html.h5('Identifier', 'class' => 'h5')
+                        @html.div('Identifier', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            identifierClass.writeHtml(hExtent[:identifier])
                         end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_lineage.rb

@@ -41,7 +41,7 @@ module ADIWG
                   # lineage - scope
                   unless hLineage[:resourceScope].empty?
                      @html.div do
-                        @html.h5('Scope', {'class' => 'h5'})
+                        @html.div('Scope', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            scopeClass.writeHtml(hLineage[:resourceScope])
                         end
@@ -51,7 +51,7 @@ module ADIWG
                   # lineage - citation
                   hLineage[:lineageCitation].each do |hCitation|
                      @html.div do
-                        @html.h5('Citation', {'class' => 'h5'})
+                        @html.div('Citation', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            citationClass.writeHtml(hCitation)
                         end
@@ -61,7 +61,7 @@ module ADIWG
                   # lineage - data sources
                   hLineage[:dataSources].each do |hsource|
                      @html.div do
-                        @html.h5('Data Source', {'class' => 'h5'})
+                        @html.div('Data Source', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            sourceClass.writeHtml(hsource)
                         end
@@ -71,7 +71,7 @@ module ADIWG
                   # lineage - process steps
                   hLineage[:processSteps].each do |hStep|
                      @html.div do
-                        @html.h5('Process Step', {'class' => 'h5'})
+                        @html.div('Process Step', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            stepClass.writeHtml(hStep)
                         end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_maintenance.rb

@@ -47,11 +47,11 @@ module ADIWG
                      # maintenance - scopes [] {scope}
                      unless hMaint[:scopes].empty?
                         @html.div do
-                           @html.h5('Maintenance Scopes', {'class' => 'h5'})
+                           @html.div('Maintenance Scopes', {'class' => 'h5'})
                            @html.div(:class => 'block') do
                               hMaint[:scopes].each do |hScope|
                                  @html.div do
-                                    @html.h5(hScope[:scopeCode], 'class' => 'h5')
+                                    @html.div(hScope[:scopeCode], 'class' => 'h5')
                                     @html.div(:class => 'block') do
                                        scopeClass.writeHtml(hScope)
                                     end
@@ -64,11 +64,11 @@ module ADIWG
                      # maintenance - contacts [] {responsibility}
                      unless hMaint[:contacts].empty?
                         @html.div do
-                           @html.h5('Maintenance Contacts', {'class' => 'h5'})
+                           @html.div('Maintenance Contacts', {'class' => 'h5'})
                            @html.div(:class => 'block') do
                               hMaint[:contacts].each do |hContact|
                                  @html.div do
-                                    @html.h5(hContact[:roleName], 'class' => 'h5')
+                                    @html.div(hContact[:roleName], 'class' => 'h5')
                                     @html.div(:class => 'block') do
                                        responsibilityClass.writeHtml(hContact)
                                     end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_medium.rb

@@ -29,7 +29,7 @@ module ADIWG
                   # medium - specification {citation}
                   unless hMedium[:mediumSpecification].empty?
                      @html.div do
-                        @html.h5('Medium Specification', {'class' => 'h5'})
+                        @html.div('Medium Specification', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            citationClass.writeHtml(hMedium[:mediumSpecification])
                         end
@@ -74,7 +74,7 @@ module ADIWG
                   # medium - identifier {identifier}
                   unless hMedium[:identifier].empty?
                      @html.div do
-                        @html.h5('Identifier for the Medium', {'class' => 'h5'})
+                        @html.div('Identifier for the Medium', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            identifierClass.writeHtml(hMedium[:identifier])
                         end

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

@@ -76,7 +76,7 @@ module ADIWG
                            # default metadata locales {locale}
                            unless hMetaInfo[:defaultMetadataLocale].empty?
                               @html.div do
-                                 @html.h5('Default Locale', {'class' => 'h5'})
+                                 @html.div('Default Locale', {'class' => 'h5'})
                                  @html.div(:class => 'block') do
                                     localeClass.writeHtml(hMetaInfo[:defaultMetadataLocale])
                                  end
@@ -86,7 +86,7 @@ module ADIWG
                            # other metadata locales [] {locale}
                            hMetaInfo[:otherMetadataLocales].each do |hLocale|
                               @html.div do
-                                 @html.h5('Other Locale', {'class' => 'h5'})
+                                 @html.div('Other Locale', {'class' => 'h5'})
                                  @html.div(:class => 'block') do
                                     localeClass.writeHtml(hLocale)
                                  end
@@ -104,7 +104,7 @@ module ADIWG
                         @html.div(:class => 'block') do
                            hMetaInfo[:metadataContacts].each do |hResponsibility|
                               @html.div do
-                                 @html.h5(hResponsibility[:roleName], 'class' => 'h5')
+                                 @html.div(hResponsibility[:roleName], 'class' => 'h5')
                                  @html.div(:class => 'block') do
                                     responsibilityClass.writeHtml(hResponsibility)
                                  end
@@ -179,7 +179,7 @@ module ADIWG
                         @html.div(:class => 'block') do
                            hMetaInfo[:alternateMetadataReferences].each do |hCitation|
                               @html.div do
-                                 @html.h5(hCitation[:title], 'class' => 'h5')
+                                 @html.div(hCitation[:title], 'class' => 'h5')
                                  @html.div(:class => 'block') do
                                     citationClass.writeHtml(hCitation)
                                     @html.br

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_releasability.rb

@@ -44,7 +44,7 @@ module ADIWG
                         @html.div(:class => 'block') do
                            hRelease[:addressee].each do |hAddressee|
                               @html.div do
-                                 @html.h5(hAddressee[:roleName], 'class' => 'h5')
+                                 @html.div(hAddressee[:roleName], 'class' => 'h5')
                                  @html.div(:class => 'block') do
                                     responsibilityClass.writeHtml(hAddressee)
                                  end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_resourceInfo.rb

@@ -154,7 +154,7 @@ module ADIWG
                            hResource[:graphicOverviews].each do |hGraphic|
                               counter += 1
                               @html.div do
-                                 @html.h5('Overview '+counter.to_s, 'class' => 'h5')
+                                 @html.div('Overview '+counter.to_s, 'class' => 'h5')
                                  @html.div(:class => 'block') do
                                     graphicClass.writeHtml(hGraphic)
                                  end
@@ -173,7 +173,7 @@ module ADIWG
                            # contacts - responsibility
                            hResource[:pointOfContacts].each do |hContact|
                               @html.div do
-                                 @html.h5(hContact[:roleName], 'class' => 'h5')
+                                 @html.div(hContact[:roleName], 'class' => 'h5')
                                  @html.div(:class => 'block') do
                                     responsibilityClass.writeHtml(hContact)
                                  end
@@ -183,7 +183,7 @@ module ADIWG
                            # contacts - credits
                            unless hResource[:credits].empty?
                               @html.div do
-                                 @html.h5('Other Credits', 'class' => 'h5')
+                                 @html.div('Other Credits', 'class' => 'h5')
                                  @html.div(:class => 'block') do
                                     hResource[:credits].each do |credit|
                                        @html.em('Credit: ')
@@ -216,7 +216,7 @@ module ADIWG
                            unless hResource[:temporalResolutions].empty?
                               hResource[:temporalResolutions].each do |hResolution|
                                  @html.div do
-                                    @html.h5('Resolution', 'class' => 'h5')
+                                    @html.div('Resolution', 'class' => 'h5')
                                     @html.div(:class => 'block') do
                                        durationClass.writeHtml(hResolution)
                                     end
@@ -347,7 +347,7 @@ module ADIWG
                            hResource[:taxonomy].each do |hTaxonomy|
                               counter += 1
                               @html.div do
-                                 @html.h5('Taxonomic Structure '+counter.to_s, 'class' => 'h5')
+                                 @html.div('Taxonomic Structure '+counter.to_s, 'class' => 'h5')
                                  @html.div(:class => 'block') do
                                     taxonomyClass.writeHtml(hTaxonomy)
                                  end

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_responsibility.rb

@@ -27,7 +27,7 @@ module ADIWG
                   hResponsibility[:parties].each do |hParty|
                      hContact = Html_Document.getContact(hParty[:contactId])
                      @html.div do
-                        @html.h5(hContact[:name], 'class' => 'h5')
+                        @html.div(hContact[:name], 'class' => 'h5')
                         @html.div(:class => 'block') do
 
                            # party - contact ID