adiwg-mdtranslator 2.18.4 → 2.19.0.pre.beta.7

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

@@ -47,7 +47,7 @@ module ADIWG
                   # associated resource - resource citation {citation}
                   unless hResource[:resourceCitation].empty?
                      @html.div do
-                        @html.div('Resource citation', {'class' => 'h5'})
+                        @html.h5('Resource citation', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            citationClass.writeHtml(hResource[:resourceCitation])
                         end
@@ -57,7 +57,7 @@ module ADIWG
                   # associated resource - metadata citation
                   unless hResource[:metadataCitation].empty?
                      @html.div do
-                        @html.div('Metadata citation', {'class' => 'h5'})
+                        @html.h5('Metadata citation', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            citationClass.writeHtml(hResource[:metadataCitation])
                         end

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

@@ -48,7 +48,7 @@ module ADIWG
                   # attribute - attribute identifiers [] {identifier}
                   hAttribute[:attributeIdentifiers].each do |hIdentifier|
                      @html.div do
-                        @html.div('Identifier', 'class' => 'h5')
+                        @html.h5('Identifier', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            identifierClass.writeHtml(hIdentifier)
                         end
@@ -121,7 +121,7 @@ module ADIWG
                   # attribute - range element description
                   hAttribute[:rangeElementDescription].each do |red|
                      @html.div do
-                        @html.div('Range Element Description', 'class' => 'h5')
+                        @html.h5('Range Element Description', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            rangeElementDescriptionClass.writeHtml(red)
                         end

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

@@ -35,7 +35,7 @@ module ADIWG
                   hGroup[:attributes].each do |hAttribute|
                      @html.div do
                         counter += 1
-                        @html.div('Attribute '+counter.to_s, {'class' => 'h5'})
+                        @html.h5('Attribute '+counter.to_s, {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            attributeClass.writeHtml(hAttribute)
                         end

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

@@ -129,6 +129,7 @@ module ADIWG
                      unless aContacts.empty?
                         @html.div do
                            @html.h2('Contacts', {'id' => 'body-contacts', 'class' => 'h2'})
+                           @html.span('', {'style' => 'mso-bookmark:body-contacts'})
                            @html.div(:class => 'block') do
                               aContacts.each do |hContact|
                                  @html.div(:class => 'block') do
@@ -144,6 +145,7 @@ module ADIWG
                      unless hMetaInfo.empty?
                         @html.div do
                         @html.h2('Metadata Information', {'id' => 'body-metadataInfo', 'class' => 'h2'})
+                        @html.span('', {'style' => 'mso-bookmark:body-metadataInfo'})
                         @html.div(:class => 'block') do
                               @html.div(:class => 'block') do
                                  metaInfoClass.writeHtml(hMetaInfo)
@@ -157,7 +159,8 @@ module ADIWG
                      unless hResourceInfo.empty?
                         @html.div do
                            @html.h2('Resource Information', {'id' => 'body-resourceInfo', 'class' => 'h2'})
-                           @html.div(:class => 'block') do
+                        @html.span('', {'style' => 'mso-bookmark:body-resourceInfo'})
+                        @html.div(:class => 'block') do
                               resourceClass.writeHtml(hResourceInfo)
                            end
                            @html.hr
@@ -167,6 +170,7 @@ module ADIWG
                      unless aDataQuality.nil? || aDataQuality.empty?
                         @html.div do
                            @html.h2('Data Quality', {'id' => 'body-dataQuality', 'class' => 'h2'})
+                           @html.span('', {'style' => 'mso-bookmark:body-dataQuality'})
                            aDataQuality.each do |hDataQuality|
                               @html.div(:class => 'block') do
                                  dataQualityClass.writeHtml(hDataQuality)
@@ -179,6 +183,7 @@ module ADIWG
                      unless aLineage.empty?
                         @html.div do
                            @html.h2('Resource Lineage', {'id' => 'body-lineage', 'class' => 'h2'})
+                           @html.span('', {'style' => 'mso-bookmark:body-lineage'})
                            @html.div(:class => 'block') do
                               aLineage.each do |hLineage|
                                  @html.div do
@@ -197,6 +202,7 @@ module ADIWG
                      unless aDistribution.empty?
                         @html.div do
                            @html.h2('Resource Distribution', {'id' => 'body-distribution', 'class' => 'h2'})
+                           @html.span('', {'style' => 'mso-bookmark:body-distribution'})
                            @html.div(:class => 'block') do
                               aDistribution.each do |hDistribution|
                                  @html.div do
@@ -215,6 +221,7 @@ module ADIWG
                      unless aAssociated.empty?
                         @html.div do
                            @html.h2('Associated Resources', {'id' => 'body-associatedResource', 'class' => 'h2'})
+                           @html.span('', {'style' => 'mso-bookmark:body-associatedResource'})
                            @html.div(:class => 'block') do
                               aAssociated.each do |hAssociated|
                                  @html.div do
@@ -233,6 +240,7 @@ module ADIWG
                      unless aAdditional.empty?
                         @html.div do
                            @html.h2('Additional Documentation', {'id' => 'body-additionalDocument', 'class' => 'h2'})
+                           @html.span('', {'style' => 'mso-bookmark:body-additionalDocument'})
                            @html.div(:class => 'block') do
                               aAdditional.each do |hAdditional|
                                  @html.div do
@@ -251,6 +259,7 @@ module ADIWG
                      unless aDictionaries.empty?
                         @html.div do
                            @html.h2('Data Dictionaries', {'id' => 'body-dataDictionary', 'class' => 'h2'})
+                           @html.span('', {'style' => 'mso-bookmark:body-dataDictionary'})
                            @html.div(:class => 'block') do
                               aDictionaries.each do |hDictionary|
                                  @html.div do
@@ -268,6 +277,7 @@ module ADIWG
                      unless aFunding.empty?
                         @html.div do
                            @html.h2('Funding', {'id' => 'body-funding', 'class' => 'h2'})
+                           @html.span('', {'style' => 'mso-bookmark:body-funding'})
                            @html.div(:class => 'block') do
                               aFunding.each do |hFunding|
                                  @html.div do
@@ -285,6 +295,7 @@ module ADIWG
                      unless aRepositories.empty?
                         @html.div do
                            @html.h2('Metadata Repositories', {'id' => 'body-repository', 'class' => 'h2'})
+                           @html.span('', {'style' => 'mso-bookmark:body-repository'})
                            @html.div(:class => 'block') do
                               aRepositories.each do |hRepository|
                                  @html.div do
@@ -298,22 +309,6 @@ module ADIWG
                         end
                      end
 
-                     # load leaflet
-                     @html.link( :rel => 'stylesheet', :href => 'https://unpkg.com/leaflet@1.0.3/dist/leaflet.css')
-                     @html.script('', :src => 'https://unpkg.com/leaflet@1.0.3/dist/leaflet.js')
-                     @html.script('', :src => 'https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js')
-
-                     # add inline javascript
-                     # read javascript from file
-                     path = File.join(File.dirname(__FILE__), 'html_bodyScript.js')
-                     file = File.open(path, 'r')
-                     bodyJS = file.read
-                     file.close
-
-                     @html.script('type'=>'text/javascript') do
-                        @html << bodyJS
-                     end
-
                   end # body
                end # writeHtml
             end # Html_Body

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

@@ -68,7 +68,7 @@ module ADIWG
                   # citation - responsibilities [] {responsibility}
                   hCitation[:responsibleParties].each do |hResponsibility|
                      @html.div do
-                        @html.div(hResponsibility[:roleName], 'class' => 'h5')
+                        @html.h5(hResponsibility[:roleName], 'class' => 'h5')
                         @html.div(:class => 'block') do
                            responsibilityClass.writeHtml(hResponsibility)
                         end
@@ -78,7 +78,7 @@ module ADIWG
                   # citation - identifier []
                   hCitation[:identifiers].each do |hIdentifier|
                      @html.div do
-                        @html.div('Identifier', 'class' => 'h5')
+                        @html.h5('Identifier', 'class' => 'h5')
                         @html.div(:class => 'block') do
                            identifierClass.writeHtml(hIdentifier)
                         end
@@ -88,7 +88,7 @@ module ADIWG
                   # citation - series
                   unless hCitation[:series].empty?
                      @html.div do
-                        @html.div('Publication Series', {'class' => 'h5'})
+                        @html.h5('Publication Series', {'class' => 'h5'})
                         @html.div(:class => 'block') do
 
                            hSeries = hCitation[:series]
@@ -121,7 +121,7 @@ module ADIWG
                   # citation - online resource []
                   hCitation[:onlineResources].each do |hOnline|
                      @html.div do
-                        @html.div('Online Resource', {'class' => 'h5'})
+                        @html.h5('Online Resource', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            onlineClass.writeHtml(hOnline)
                         end
@@ -131,7 +131,7 @@ module ADIWG
                   # citation - browse graphic []
                   hCitation[:browseGraphics].each do |hGraphic|
                      @html.div do
-                        @html.div('Graphic Overview', {'class' => 'h5'})
+                        @html.h5('Graphic Overview', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            graphicClass.writeHtml(hGraphic)
                         end

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

@@ -33,7 +33,7 @@ module ADIWG
                         aClassItems = hClassD[:classedDataItems]
                         aClassItems.each do |hClassItem|
                             @html.div do
-                                @html.div(hClassItem[:className], {'class'=>'h5'})
+                                @html.h5(hClassItem[:className], {'class'=>'h5'})
                                 @html.div(:class=>'block') do
                                     htmlClassItem.writeHtml(hClassItem)
                                 end

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

@@ -52,7 +52,7 @@ module ADIWG
                   # constraint - scope {scope}
                   unless hConstraint[:scope].empty?
                      @html.div do
-                        @html.div('Scope', {'class' => 'h5'})
+                        @html.h5('Scope', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            scopeClass.writeHtml(hConstraint[:scope])
                         end
@@ -62,7 +62,7 @@ module ADIWG
                   # constraint - graphic [] {graphic}
                   hConstraint[:graphic].each do |hGraphic|
                      @html.div do
-                        @html.div('Graphic', {'class' => 'h5'})
+                        @html.h5('Graphic', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            graphicClass.writeHtml(hGraphic)
                         end
@@ -72,7 +72,7 @@ module ADIWG
                   # constraint - reference [] {citation}
                   hConstraint[:reference].each do |hReference|
                      @html.div do
-                        @html.div('Reference', {'class' => 'h5'})
+                        @html.h5('Reference', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            citationClass.writeHtml(hReference)
                         end
@@ -82,7 +82,7 @@ module ADIWG
                   # constraint - releasability {releasability}
                   unless hConstraint[:releasability].empty?
                      @html.div do
-                        @html.div('Releasability', {'class' => 'h5'})
+                        @html.h5('Releasability', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            releasabilityClass.writeHtml(hConstraint[:releasability])
                         end
@@ -92,7 +92,7 @@ module ADIWG
                   # constraint - responsibility [] {responsibility}
                   hConstraint[:responsibleParty].each do |hResponsibility|
                      @html.div do
-                        @html.div(hResponsibility[:roleName], {'class' => 'h5'})
+                        @html.h5(hResponsibility[:roleName], {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            responsibilityClass.writeHtml(hResponsibility)
                         end

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

@@ -28,7 +28,7 @@ module ADIWG
                   graphicClass = Html_Graphic.new(@html)
 
                   @html.div do
-                     @html.div(hContact[:name], {'id' => 'CID_' + hContact[:contactId], 'class' => 'h3'})
+                     @html.h3(hContact[:name], {'id' => 'CID_' + hContact[:contactId], 'class' => 'h3'})
                      @html.div(:class => 'block') do
 
                         # contact - contact ID
@@ -70,7 +70,7 @@ module ADIWG
                         # contact - address
                         hContact[:addresses].each do |hAddress|
                            @html.div do
-                              @html.div('Address', {'class' => 'h5'})
+                              @html.h5('Address', {'class' => 'h5'})
                               @html.div(:class => 'block') do
 
                                  # address - delivery points
@@ -119,7 +119,7 @@ module ADIWG
                         # contact - phones
                         hContact[:phones].each do |hPhone|
                            @html.div do
-                              @html.div('Phone', {'class' => 'h5'})
+                              @html.h5('Phone', {'class' => 'h5'})
                               @html.div(:class => 'block') do
 
                                  # phone - name
@@ -159,7 +159,7 @@ module ADIWG
                         # contact - online resource []
                         hContact[:onlineResources].each do |hOnline|
                            @html.div do
-                              @html.div('Online Resource', {'class' => 'h5'})
+                              @html.h5('Online Resource', {'class' => 'h5'})
                               @html.div(:class => 'block') do
                                  onlineClass.writeHtml(hOnline)
                               end
@@ -169,7 +169,7 @@ module ADIWG
                         # contact - logos []
                         hContact[:logos].each do |hLogo|
                            @html.div do
-                              @html.div('Logo Graphic', {'class' => 'h5'})
+                              @html.h5('Logo Graphic', {'class' => 'h5'})
                               @html.div(:class => 'block') do
                                  graphicClass.writeHtml(hLogo)
                               end
@@ -190,6 +190,38 @@ module ADIWG
                            @html.br
                         end
 
+                        # contact - external identifiers []
+                        if hContact.key?(:externalIdentifier) && !hContact[:externalIdentifier].empty?
+                           hContact[:externalIdentifier].each do |identifier|
+                              @html.div do
+                                 @html.h5("External Identifier", {'class' => 'h5'})
+                                 @html.div(:class => 'block') do
+                                    @html.em('Identifier: ')
+                                    @html.text!(identifier[:identifier])
+                                    @html.br
+
+                                    unless identifier[:namespace].nil?
+                                       @html.em('Namespace: ')
+                                       @html.text!(identifier[:namespace])
+                                       @html.br
+                                    end
+
+                                    unless identifier[:version].nil?
+                                       @html.em('Version: ')
+                                       @html.text!(identifier[:version])
+                                       @html.br
+                                    end
+
+                                    unless identifier[:description].nil?
+                                       @html.em('Description: ')
+                                       @html.text!(identifier[:description])
+                                       @html.br
+                                    end
+                                 end
+                              end
+                           end
+                        end
+
                      end
                   end
 

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

@@ -45,7 +45,7 @@ module ADIWG
                   # coverage - process level code
                   unless hCoverage[:processingLevelCode].empty?
                      @html.div do
-                        @html.div('Processing Level Code', {'class' => 'h5'})
+                        @html.h5('Processing Level Code', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            identifierClass.writeHtml(hCoverage[:processingLevelCode])
                         end
@@ -55,7 +55,7 @@ module ADIWG
                   # coverage - attribute group [] {attributeGroup}
                   hCoverage[:attributeGroups].each do |hAttGroup|
                      @html.div do
-                        @html.div('Attribute Group', {'class' => 'h5'})
+                        @html.h5('Attribute Group', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            attGroupClass.writeHtml(hAttGroup)
                         end
@@ -65,7 +65,7 @@ module ADIWG
                   # coverage - image description {imageInfo}
                   unless hCoverage[:imageDescription].empty?
                      @html.div do
-                        @html.div('Image Description', {'class' => 'h5'})
+                        @html.h5('Image Description', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            imageClass.writeHtml(hCoverage[:imageDescription])
                         end

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

@@ -51,7 +51,7 @@ module ADIWG
                   # dictionary - domains [] {domain}
                   unless hDictionary[:domains].empty?
                      @html.div do
-                        @html.div('Domains', {'class' => 'h5'})
+                        @html.h5('Domains', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            domainClass.writeHtml(hDictionary[:domains])
                         end
@@ -61,7 +61,7 @@ module ADIWG
                   # dictionary - entities [] {entity}
                   unless hDictionary[:entities].empty?
                      @html.div do
-                        @html.div('Entities', {'class' => 'h5'})
+                        @html.h5('Entities', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            entityClass.writeHtml(hDictionary[:entities])
                         end
@@ -71,7 +71,7 @@ module ADIWG
                   # dictionary - citation {citation}
                   unless hDictionary[:citation].empty?
                      @html.div do
-                        @html.div('Citation', {'class' => 'h5'})
+                        @html.h5('Citation', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            citationClass.writeHtml(hDictionary[:citation])
                         end
@@ -81,7 +81,7 @@ module ADIWG
                   # dictionary - locales {locale}
                   hDictionary[:locales].each do |hLocale|
                      @html.div do
-                        @html.div('Locale', {'class' => 'h5'})
+                        @html.h5('Locale', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            localeClass.writeHtml(hLocale)
                         end
@@ -91,7 +91,7 @@ module ADIWG
                   # dictionary - responsible party {responsibility}
                   unless hDictionary[:responsibleParty].empty?
                      @html.div do
-                        @html.div(hDictionary[:responsibleParty][:roleName], {'class' => 'h5'})
+                        @html.h5(hDictionary[:responsibleParty][:roleName], {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            responsibilityClass.writeHtml(hDictionary[:responsibleParty])
                         end

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

@@ -1,4 +1,6 @@
 require_relative 'html_citation'
+require_relative 'html_scope'
+require_relative 'html_dataQualityReport'
 
 module ADIWG
   module Mdtranslator
@@ -12,14 +14,13 @@ module ADIWG
           def writeHtml(hDataQuality)
             citationClass = Html_Citation.new(@html)
             scopeClass = Html_Scope.new(@html)
+            dataQualityReportClass = Html_DataQualityReport.new(@html)
 
-            unless hDataQuality[:scope].nil? || hDataQuality[:scope].empty?
-              @html.div(class: 'block') do
-                @html.div do
-                  @html.div('Scope', {'class' => 'h5'})
-                  @html.div(class: 'block') do
-                    scopeClass.writeHtml(hDataQuality[:scope])
-                  end
+            unless hDataQuality[:scope].empty?
+              @html.div do
+                @html.h5('Scope', {'class' => 'h5'})
+                @html.div(:class => 'block') do
+                  scopeClass.writeHtml(hDataQuality[:scope])
                 end
               end
             end
@@ -30,11 +31,11 @@ module ADIWG
                      hDataQuality[:standaloneQualityReport][:reportReference].nil? )
               report = hDataQuality[:standaloneQualityReport]
 
-              @html.div(class: 'block') do
+              @html.div(:class => 'block') do
                 @html.div do
-                  @html.div('Standalone Quality Report', {'class' => 'h5'})
+                  @html.h5('Standalone Quality Report', {'class' => 'h5'})
                   unless report[:abstract].nil?
-                    @html.div(class: 'block') do
+                    @html.div(:class =>'block') do
                       @html.em('Abstract:')
                       @html.text!(report[:abstract])
                     end
@@ -42,16 +43,34 @@ module ADIWG
 
                   unless report[:reportReference].nil?
                     @html.div do
-                      @html.div('Report Reference', {'class' => 'h5'})
-                      @html.div(class: 'block') do
+                      @html.h5('Report Reference', {'class' => 'h5'})
+                      @html.div(:class =>'block') do
                         citationClass.writeHtml(report[:reportReference])
                       end
                     end
                   end
+
                 end
               end
+            end
 
+            # reports
+            unless hDataQuality[:report].empty?
+              @html.div(:class =>'block') do
+                @html.div do
+                  @html.h4('Reports', {'class' => 'h4'})
+                  hDataQuality[:report].each do |report|
+                    @html.div(:class =>'block') do
+                      @html.div do
+                        @html.h5('Report', {'class' => 'h5'})
+                        dataQualityReportClass.writeHtml(report)
+                      end
+                    end
+                  end
+                end
+              end
             end
+
           end
         end
       end