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

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_dataQualityReport.rb

@@ -4,6 +4,7 @@ require_relative 'module_coverageResult'
 require_relative 'module_descriptiveResult'
 require_relative 'module_quantitativeResult'
 require_relative 'module_evaluationMethod'
+require_relative 'module_qualityMeasure'
 
 module ADIWG
   module Mdtranslator
@@ -28,6 +29,10 @@ module ADIWG
 
             intReport[:type] = hReport["type"]
 
+            if hReport.has_key?('standaloneQualityReportDetails')
+              intReport[:standaloneQualityReportDetails] = hReport['standaloneQualityReportDetails']
+            end
+
             if hReport.has_key?('conformanceResult')
               hReport['conformanceResult'].each do |item|
                 hReturn = ConformanceResult.unpack(item, responseObj)
@@ -68,23 +73,10 @@ module ADIWG
             end
 
             if hReport.has_key?('qualityMeasure')
-              qualityMeasure = hReport['qualityMeasure']
-              identifier = qualityMeasure['identifier']
-
-              intReport[:qualityMeasure] = {}
-
-              if identifier
-                intReport[:qualityMeasure][:identifier] = {
-                  identifier: identifier['identifier'],
-                  namespace: identifier['namespace'],
-                  version: identifier['version'],
-                  description: identifier['description']
-                }
-              end
+              hReturn = QualityMeasure.unpack(hReport['qualityMeasure'], responseObj)
 
-              if qualityMeasure
-                intReport[:qualityMeasure][:name] = qualityMeasure['name']
-                intReport[:qualityMeasure][:description] = qualityMeasure['description']
+              unless hReturn.nil?
+                intReport[:qualityMeasure] = hReturn
               end
             end
 

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_evaluationMethod.rb

@@ -6,7 +6,7 @@ module ADIWG
       module MdJson
 
         module EvaluationMethod
-          def self.unpack(hMethod, responseObj, inContext = nil)
+          def self.unpack(hMethod, responseObj)
 
             intMetadataClass = InternalMetadata.new
             intMethod = intMetadataClass.newEvaluationMethod

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_legalConstraint.rb

@@ -34,21 +34,21 @@ module ADIWG
 
                   haveLegal = false
 
-                  # legal constraint - use constraint []
-                  if hLegalCon.has_key?('useConstraint')
-                     hLegalCon['useConstraint'].each do |item|
+                  # legal constraint - access constraint []
+                  if hLegalCon.has_key?('accessConstraint')
+                     hLegalCon['accessConstraint'].each do |item|
                         unless item == ''
-                           intLegalCon[:useCodes] << item
+                           intLegalCon[:accessCodes] << item
                            haveLegal = true
                         end
                      end
                   end
 
-                  # legal constraint - access constraint []
-                  if hLegalCon.has_key?('accessConstraint')
-                     hLegalCon['accessConstraint'].each do |item|
+                  # legal constraint - use constraint []
+                  if hLegalCon.has_key?('useConstraint')
+                     hLegalCon['useConstraint'].each do |item|
                         unless item == ''
-                           intLegalCon[:accessCodes] << item
+                           intLegalCon[:useCodes] << item
                            haveLegal = true
                         end
                      end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_qualityMeasure.rb

@@ -0,0 +1,34 @@
+require_relative 'module_identifier'
+
+module ADIWG
+    module Mdtranslator
+        module Readers
+            module MdJson
+
+                module QualityMeasure
+                    def self.unpack(hQualityMeasure, responseObj)
+
+                        intMetadataClass = InternalMetadata.new
+                        intQualityMeasure = intMetadataClass.newQualityMeasure
+
+                        intQualityMeasure[:description] = hQualityMeasure['description']
+
+                        if hQualityMeasure.has_key?('name')
+                            intQualityMeasure[:nameOfMeasure] = hQualityMeasure['name']
+                        end
+
+                        if hQualityMeasure.has_key?('identifier')
+                            hReturn = Identifier.unpack(hQualityMeasure['identifier'], responseObj)
+                            unless hReturn.nil?
+                                intQualityMeasure[:identifier] = hReturn
+                            end
+                        end
+
+                        return intQualityMeasure
+
+                    end
+                end
+            end
+        end
+    end
+end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_qualityResultFile.rb

@@ -0,0 +1,72 @@
+require_relative 'module_format'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module MdJson
+
+            module QualiltyResultFile
+
+                def self.unpack(hContent, responseObj)
+                    @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+                    # return nil object if input is empty
+                    if hContent.empty?
+                        @MessagePath.issueWarning(130, responseObj)
+                        return nil
+                    end
+
+                    # instance classes needed in script
+                    intMetadataClass = InternalMetadata.new
+                    intContent = intMetadataClass.newQualityResultFile
+
+                    # content information - file name (required)
+                    if hContent.has_key?('fileName')
+                        unless hContent['fileName'] == ''
+                        intContent[:fileName] = hContent['fileName']
+                        end
+                    end
+                    if intContent[:fileName].nil?
+                        @MessagePath.issueError(131, responseObj)
+                    end
+
+                    # content information - file description (required)
+                    if hContent.has_key?('fileDescription')
+                        unless hContent['fileDescription'] == ''
+                        intContent[:fileDescription] = hContent['fileDescription']
+                        end
+                    end
+                    if intContent[:fileDescription].nil?
+                        @MessagePath.issueError(132, responseObj)
+                    end
+
+                    # content information - file type
+                    if hContent.has_key?('fileType')
+                        unless hContent['fileType'] == ''
+                        intContent[:fileType] = hContent['fileType']
+                        end
+                    end
+                    if intContent[:fileType].nil?
+                        @MessagePath.issueError(131, responseObj)
+                    end
+
+                    if hContent.has_key?('fileFormat')
+                        hObject = hContent['fileFormat']
+                        unless hObject.empty?
+                            hReturn = Format.unpack(hObject, responseObj)
+                            unless hReturn.nil?
+                                intContent[:fileFormat] = hReturn
+                            end
+                        end
+                    end
+
+                    return intContent
+
+                end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_rangeElementDescription.rb

@@ -23,8 +23,8 @@ module ADIWG
               intRangeElementDescription[:definition] = hRangeElementDescription['definition']
             end
 
-            if hRangeElementDescription.has_key?('rangeElements')
-              intRangeElementDescription[:rangeElements] = hRangeElementDescription['rangeElements']
+            if hRangeElementDescription.has_key?('rangeElement')
+              intRangeElementDescription[:rangeElement] = hRangeElementDescription['rangeElement']
             end
 
             return intRangeElementDescription

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_contact.rb

@@ -249,6 +249,19 @@ module ADIWG
                            end
                         end
 
+                        # orcId - external contact identifier
+                        if hSbContact.has_key?('orcId') && hSbContact['contactType'] == 'person'
+                           hContact[:externalIdentifier] ||= []
+                           unless hSbContact['orcId'].nil? || hSbContact['orcId'] == ''
+                              hExternalIdentifier = {
+                                 "identifier": hSbContact['orcId'],
+                                 "namespace": "ORCID",
+                                 "description": "Open Researcher and Contributor Id"
+                              }
+                              hContact[:externalIdentifier] << hExternalIdentifier
+                           end
+                        end
+
                         aContacts << hContact
                         aContacts << hContactOrg unless hContactOrg.empty?
 

data/lib/adiwg/mdtranslator/version.rb

@@ -109,7 +109,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.18.4"
+      VERSION = "2.19.0-beta.8"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/{class_quality.rb → class_dataQuality.rb}

@@ -12,7 +12,7 @@ module ADIWG
       module Writers
          module Fgdc
 
-            class Quality
+            class DataQuality
 
                def initialize(xml, hResponseObj)
                   @xml = xml
@@ -30,7 +30,7 @@ module ADIWG
                   if hDataQuality && hDataQuality[:report]
                      # data quality 2.1 (attracc) - attribute accuracy (not implemented)
                      attribute_completeness_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_NonQuantitativeAttributeCompleteness' &&
+                        report[:type] == 'NonQuantitativeAttributeCompleteness' &&
                         !report.dig(:descriptiveResult, 0, :statement).nil?
                      end
 
@@ -44,11 +44,11 @@ module ADIWG
 
                      # data quality 2.2 (logic) - logical consistency (not implemented) (required)
                      logic_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_ConceptualConsistency' &&
+                        report[:type] == 'ConceptualConsistency' &&
                         !report.dig(:qualityMeasure, :description).nil?
                      end
 
-                     if logic = logic_report&.dig(:qualityMeasure, :decription)
+                     if logic = logic_report&.dig(:qualityMeasure, :description)
                         @xml.tag!('logic', logic)
                      else
                         @xml.tag!('logic', 'Not Reported')
@@ -56,7 +56,7 @@ module ADIWG
 
                      # data quality 2.3 (complete) - completion report (not implemented) (required)
                      completeness_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_CompletenessOmission' &&
+                        report[:type] == 'CompletenessOmission' &&
                         !report.dig(:descriptiveResult, 0, :statement).nil?
                      end
 
@@ -66,20 +66,24 @@ module ADIWG
                         @xml.tag!('complete', 'Not Reported')
                      end
 
-                     # data quality 2.4 (position) - positional accuracy (not implemented)
+                     # data quality 2.4 (position) - positional accuracy
 
 
                      horizontal_positional_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_AbsoluteExternalPositionalAccuracy' &&
-                        report.dig(:qualityMeasure, :name) == 'Horizontal Positional Accuracy Report'
+                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
+                        report.dig(:qualityMeasure, :nameOfMeasure)&.any? { |name|
+                           name == 'Horizontal Positional Accuracy Report'
+                        }
                      end
 
                      horizpar = horizontal_positional_accuracy_report&.dig(:evaluationMethod, :methodDescription)
 
 
                      vertical_positional_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_AbsoluteExternalPositionalAccuracy' &&
-                        report.dig(:qualityMeasure, :name) == 'Vertical Positional Accuracy Report'
+                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
+                        report.dig(:qualityMeasure, :nameOfMeasure)&.any? { |name|
+                           name == 'Vertical Positional Accuracy Report'
+                        }
                      end
 
                      vertaccr = vertical_positional_accuracy_report&.dig(:evaluationMethod, :methodDescription)

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_fgdc.rb

@@ -5,7 +5,7 @@
 #  Stan Smith 2017-11-16 original script
 
 require_relative 'class_identification'
-require_relative 'class_quality'
+require_relative 'class_dataQuality'
 require_relative 'class_spatialOrganization'
 require_relative 'class_spatialReference'
 require_relative 'class_dictionary'
@@ -33,7 +33,7 @@ module ADIWG
 
                   # classes used
                   idClass = Identification.new(@xml, @hResponseObj)
-                  qualityClass = Quality.new(@xml, @hResponseObj)
+                  dataQualityClass = DataQuality.new(@xml, @hResponseObj)
                   spaceOrgClass = SpatialOrganization.new(@xml, @hResponseObj)
                   spaceRefClass = SpatialReference.new(@xml, @hResponseObj)
                   dictionaryClass = DataDictionary.new(@xml, @hResponseObj)
@@ -62,7 +62,7 @@ module ADIWG
                      # currently only lineage is implemented
                      unless intObj[:metadata][:lineageInfo].empty?
                         @xml.tag!('dataqual') do
-                           qualityClass.writeXML(intObj)
+                           dataQualityClass.writeXML(intObj)
                         end
                      end
                      if intObj[:metadata][:lineageInfo].empty? && @hResponseObj[:writerShowTags]

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

@@ -71,6 +71,7 @@ module ADIWG
                         @html.a(' Contacts', {'href' => '#body-contacts', 'class' => 'btn navBtn', 'id' => 'contactButton'})
                         @html.a(' Metadata', {'href' => '#body-metadataInfo', 'class' => 'btn navBtn', 'id' => 'metadataButton'})
                         @html.a(' Resource', {'href' => '#body-resourceInfo', 'class' => 'btn navBtn', 'id' => 'resourceButton'})
+                        @html.a(' Quality', {'href' => '#body-dataQuality', 'class' => 'btn navBtn', 'id' => 'qualityButton'})
                         @html.a(' Lineage', {'href' => '#body-lineage', 'class' => 'btn navBtn', 'id' => 'lineageButton'})
                         @html.a(' Distribution', {'href' => '#body-distribution', 'class' => 'btn navBtn', 'id' => 'distributionButton'})
                         @html.a(' Associated', {'href' => '#body-associatedResource', 'class' => 'btn navBtn', 'id' => 'associatedButton'})
@@ -169,7 +170,10 @@ module ADIWG
                            @html.summary('Data Quality', {'id' => 'body-dataQuality', 'class' => 'h2'})
                            aDataQuality.each do |hDataQuality|
                               @html.section(:class => 'block') do
-                                 dataQualityClass.writeHtml(hDataQuality)
+                                 @html.details do
+                                    @html.summary('Quality', {'class' => 'h3'})
+                                    dataQualityClass.writeHtml(hDataQuality)
+                                 end
                               end
                            end
                         end

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

@@ -1,4 +1,6 @@
 require_relative 'html_citation'
+require_relative 'html_dataQualityReport'
+require_relative 'html_scope'
 
 module ADIWG
   module Mdtranslator
@@ -12,46 +14,65 @@ 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.section(class: 'block') do
+            # scope
+            unless hDataQuality[:scope].empty?
+              @html.section(:class => 'block') do
                 @html.details do
-                  @html.summary('Scope', {'class' => 'h5'})
-                  @html.section(class: 'block') do
+                  @html.summary('Scope', {'class' => 'h4'})
+                  @html.section(:class => 'block') do
                     scopeClass.writeHtml(hDataQuality[:scope])
                   end
                 end
               end
             end
 
-
-            unless hDataQuality[:standaloneQualityReport].nil? || 
-                   ( hDataQuality[:standaloneQualityReport][:abstract].nil? && 
-                     hDataQuality[:standaloneQualityReport][:reportReference].nil? )
-              report = hDataQuality[:standaloneQualityReport]
-
-              @html.section(class: 'block') do
+            # standalone quality report
+            unless hDataQuality[:standaloneReport].nil? || 
+                   ( hDataQuality[:standaloneReport][:abstract].nil? && 
+                     hDataQuality[:standaloneReport][:reportReference].nil? )
+              report = hDataQuality[:standaloneReport]
+              @html.section(:class => 'block') do
                 @html.details do
-                  @html.summary('Standalone Quality Report', {'class' => 'h5'})
+                  @html.summary('Standalone Quality Report', {'class' => 'h4'})
                   unless report[:abstract].nil?
-                    @html.section(class: 'block') do
+                    @html.section(:class => 'block') do
                       @html.em('Abstract:')
                       @html.text!(report[:abstract])
                     end
                   end
-
                   unless report[:reportReference].nil?
-                    @html.details do
-                      @html.summary('Report Reference', {'class' => 'h5'})
-                      @html.section(class: 'block') do
-                        citationClass.writeHtml(report[:reportReference])
+                    @html.section(:class => 'block') do
+                      @html.details do
+                        @html.summary('Report Reference', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                          citationClass.writeHtml(report[:reportReference])
+                        end
                       end
                     end
                   end
                 end
               end
+            end
 
+            # reports
+            unless hDataQuality[:report].nil? || hDataQuality[:report].empty?
+              @html.section(:class => 'block') do
+                @html.details do
+                  @html.summary('Reports', {'class' => 'h4'})
+                  hDataQuality[:report].each do |report|
+                    @html.section(:class => 'block') do
+                      @html.details do
+                        @html.summary('Report', {'class' => 'h5'})
+                        dataQualityReportClass.writeHtml(report)
+                      end
+                    end
+                  end
+                end
+              end
             end
+
           end
         end
       end