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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee12914b52bf9c3e2d2cda21512ad9ec11d1f6130bd2c648af133d8cf34c4bb7
-  data.tar.gz: fea1b82372e6fa3709e232e3ce51402dd59d77513688757b2c2d04d992f9ebbf
+  metadata.gz: 8647fe7165b6765e1454c49ddb93f00de18a4b1e86ff48484ec4cf8f8871921a
+  data.tar.gz: 00740a0d7738dc25014791ea2d3f7380d9d4e7e3dd67eaed1e277065315401da
 SHA512:
-  metadata.gz: ec33267110576817cb630c1e89b93ff42819221fcbf04be01f60619c156ab4b3e118f039900aec28be75defa4291c5a5d6bdf77eb1542395e864e68d2c5fda85
-  data.tar.gz: 594b0a6433071bd297f907886e3ef07a7bc5568cbb055dd1cb173f629412f3c2cf3beaa836842b4dd07dea777423fe94b514b4181a66342961e73395dc69e7b6
+  metadata.gz: 4dc6c0f0ee4a44fe7007ce96d69de2b4b749d3a3baac6f3d0807c0956c57b43fb8c500a482120c24d2ea862903804975e14ae3b2eb0e275e22c8394906f56a0f
+  data.tar.gz: 4c13b5afadda8b771a411e81f9d773ade5cfb80c219f471ecc4e957bb89012fcd5602708208a40172443a353ef05d35b2763119af7af6cb1e9dd60280b427827

data/.github/workflows/test.yml

@@ -0,0 +1,14 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
+        with:
+          ruby-version: "3.1" # Not needed with a .ruby-version file
+      - run: bundle install
+      - run: bundle exec rake

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    adiwg-mdtranslator (2.18.4)
-      adiwg-mdcodes (= 2.8.4)
-      adiwg-mdjson_schemas (= 2.8.1)
+    adiwg-mdtranslator (2.19.0.pre.beta.8)
+      adiwg-mdcodes (= 2.9.2)
+      adiwg-mdjson_schemas (= 2.9.1)
       builder (~> 3.2)
       coderay (~> 1.1)
       jbuilder (~> 2.5)
       json (~> 2.0)
       json-schema (~> 2.7)
       kramdown (>= 1.13, < 3.0)
-      nokogiri (~> 1.7)
+      nokogiri (~> 1.15)
       thor (~> 0.19)
       uuidtools (~> 2.1)
 
@@ -30,9 +30,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    adiwg-mdcodes (2.8.4)
+    adiwg-mdcodes (2.9.2)
       json (~> 2.0)
-    adiwg-mdjson_schemas (2.8.1)
+    adiwg-mdjson_schemas (2.9.1)
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
@@ -51,11 +51,13 @@ GEM
     loofah (2.21.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mini_portile2 (2.4.0)
     minitest (5.20.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.15.5-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.5-x86_64-linux)
+      racc (~> 1.4)
     public_suffix (4.0.7)
+    racc (1.7.3)
     rails-dom-testing (2.1.1)
       activesupport (>= 5.0.0)
       minitest

data/adiwg-mdtranslator.gemspec

@@ -34,11 +34,11 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency "thor", "~> 0.19"
    spec.add_runtime_dependency "uuidtools", "~> 2.1"
    spec.add_runtime_dependency "json-schema", "~> 2.7"
-   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.8.1"
-   spec.add_runtime_dependency "adiwg-mdcodes", "2.8.4"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.9.1"
+   spec.add_runtime_dependency "adiwg-mdcodes", "2.9.2"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", ">= 1.13", "< 3.0"
    spec.add_runtime_dependency "coderay", "~> 1.1"
-   spec.add_runtime_dependency "nokogiri", "~> 1.7"
+   spec.add_runtime_dependency "nokogiri", "~> 1.15"
 
 end

data/lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -513,6 +513,14 @@ class InternalMetadata
       }
    end
 
+   def newRangeElementDescription
+      {
+         name: nil,
+         definition: nil,
+         rangeElement: []
+      }
+   end
+
    def newImageDescription
       {
          illuminationElevationAngle: nil,
@@ -650,13 +658,22 @@ class InternalMetadata
       }
    end
 
+   def newQualityResultFile
+      {
+         fileName: nil,
+         fileType: nil,
+         fileDescription: nil,
+         fileFormat: {}
+      }
+   end
+
    def newCoverageResult
       {
          dateTime: nil,
          scope: {},
-         spatialRepresentationType: {},
+         spatialRepresentationType: nil,
          spatialRepresentation: {},
-         resultContent: [],
+         resultContentDescription: {},
          resourceFormat: {},
          resultFile: {}
       }
@@ -705,23 +722,22 @@ class InternalMetadata
 
    def newDataQualityReport
       {
-         # standaloneQualityReportDetails: nil,
-         conformanceResult: [],
-         coverageResult: [],
-         # derivedElementReport: [],
-         descriptiveResult: [],
-         evaluationMethod: {},
+         type: nil,
+         standaloneQualityReportDetails: nil,
          qualityMeasure: {},
+         evaluationMethod: {},
          quantitativeResult: [],
-         # relatedElementReport: []
+         descriptiveResult: [],
+         conformanceResult: [],
+         coverageResult: [],
+         derivedElementReport: []
       }
    end
 
    def newStandaloneReport
       {
-         reportReference: {},
          abstract: nil,
-         elementReports: []
+         reportReference: {},
       }
    end
 
@@ -935,8 +951,8 @@ class InternalMetadata
          statement: nil,
          resourceScope: {},
          lineageCitation: [],
-         dataSources: [],
-         processSteps: []
+         processSteps: [],
+         dataSources: []
       }
    end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_dataQuality.rb

@@ -0,0 +1,149 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc data quality
+
+# History:
+#  Stan Smith 2017-08-15 original script
+
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative 'module_lineage'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module DataQuality
+
+               def self.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
+                  intMetadataClass = InternalMetadata.new
+
+                  hDataQuality[:scope] = intMetadataClass.newScope
+                  hDataQuality[:scope][:scopeCode] = 'tabularDataset'
+
+                  hDataQuality[:systemIdentifier] = {
+                     uid: UUIDTools::UUID.random_create.to_s,
+                     label: "CSDGM Data Quality"
+                  }
+
+                  # data quality 2.1 (attracc) - attribute accuracy
+                  xAccuracy = xDataQual.xpath('./attracc')
+                  accuracyReport = xAccuracy.xpath('./attraccr').text
+                  report = intMetadataClass.newDataQualityReport
+                  report[:type] = 'NonQuantitativeAttributeAccuracy'
+                  descriptiveResult = intMetadataClass.newDescriptiveResult
+                  descriptiveResult[:statement] = accuracyReport
+                  report[:descriptiveResult] << descriptiveResult
+                  hDataQuality[:report] << report
+
+                  # data quality 2.1 (qattracc) - Quantitative Attribute Accuracy Assessment
+                  xQuantitativeAccuracy = xDataQual.xpath('./qattracc')
+                  unless xQuantitativeAccuracy.xpath('./attraccv').empty?
+                     value = xQuantitativeAccuracy.xpath('./attraccv').text
+                     report = intMetadataClass.newDataQualityReport
+                     report[:type] = 'QuantitativeAttributeAccuracy'
+                     quantitativeResult = intMetadataClass.newQuantitativeResult
+                     quantitativeResult[:values] << value
+                     report[:quantitativeResult] << quantitativeResult
+                     hDataQuality[:report] << report
+                  end
+
+                  # data quality 2.2 (logic) - logical consistency (required) (not implemented)
+                  xLogic = xDataQual.xpath('./logic')
+                  if xLogic.empty?
+                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: data quality logical consistency section is missing'
+                  else
+                     logic = xLogic.text
+                     report = intMetadataClass.newDataQualityReport
+                     report[:type] = 'ConceptualConsistency'
+                     report[:qualityMeasure] = intMetadataClass.newQualityMeasure
+                     report[:qualityMeasure][:description] = logic
+                     hDataQuality[:report] << report
+                  end
+
+                  # data quality 2.3 (complete) - completion report (required)
+                  xComplete = xDataQual.xpath('./complete')
+                  if xComplete.empty?
+                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: data quality completion report section is missing'
+                  else
+                     complete = xComplete.text
+                     report = intMetadataClass.newDataQualityReport
+                     report[:type] = 'CompletenessOmission'
+                     descriptiveResult = intMetadataClass.newDescriptiveResult
+                     descriptiveResult[:statement] = complete
+                     report[:descriptiveResult] << descriptiveResult
+                     hDataQuality[:report] << report
+                  end
+
+                  # data quality 2.4 (position) - positional accuracy
+                  xPositionalAccuracy = xDataQual.xpath('./posacc')
+                  unless xPositionalAccuracy.empty?
+                     # horizontal positional accuracy
+                     xHorizontal = xPositionalAccuracy.xpath('./horizpa')
+                     unless xHorizontal.empty?
+                        report = intMetadataClass.newDataQualityReport
+                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
+                        unless xHorizontal.xpath('qhorizpa/horizpae').empty?
+                           report[:qualityMeasure] = intMetadataClass.newQualityMeasure
+                           report[:qualityMeasure][:description] = xHorizontal.xpath('qhorizpa/horizpae').text
+                           name = 'Horizontal Positional Accuracy Report'
+                           report[:qualityMeasure][:nameOfMeasure] << name
+                        end
+                        unless xHorizontal.xpath('horizpar').empty?
+                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
+                           report[:evaluationMethod][:methodDescription] = xHorizontal.xpath('horizpar').text
+                        end
+                        unless xHorizontal.xpath('qhorizpa/horizpav').empty?
+                           quantitativeResult = intMetadataClass.newQuantitativeResult
+                           value = xHorizontal.xpath('qhorizpa/horizpav').text
+                           quantitativeResult[:values] << value
+                           report[:quantitativeResult] << quantitativeResult
+                        end
+                        hDataQuality[:report] << report
+                     end
+                     # vertical positional accuracy
+                     xVertical = xPositionalAccuracy.xpath('./vertacc')
+                     unless xVertical.empty?
+                        report = intMetadataClass.newDataQualityReport
+                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
+                        unless xVertical.xpath('qvertpa/vertacce').empty?
+                           report[:qualityMeasure] = intMetadataClass.newQualityMeasure
+                           report[:qualityMeasure][:description] = xVertical.xpath('qvertpa/vertacce').text
+                           name = 'Vertical Positional Accuracy Report'
+                           report[:qualityMeasure][:nameOfMeasure] << name
+                        end
+                        unless xVertical.xpath('vertaccr').empty?
+                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
+                           report[:evaluationMethod][:methodDescription] = xVertical.xpath('vertaccr').text
+                        end
+                        unless xVertical.xpath('qvertpa/vertaccv').empty?
+                           quantitativeResult = intMetadataClass.newQuantitativeResult
+                           value = xVertical.xpath('qvertpa/vertaccv').text
+                           quantitativeResult[:values] << value
+                           report[:quantitativeResult] << quantitativeResult
+                        end
+                        hDataQuality[:report] << report
+                     end
+                  end
+
+                  # data quality 2.5 (lineage) - lineage (required)
+                  xLineage = xDataQual.xpath('./lineage')
+                  unless xLineage.empty?
+                     hLineage = Lineage.unpack(xLineage, hResponseObj)
+                     unless hLineage.nil?
+                        hMetadata[:lineageInfo] << hLineage
+                     end
+                  end
+                  if xLineage.nil?
+                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: data quality lineage section is missing'
+                  end
+
+                  return hDataQuality
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_fgdc.rb

@@ -10,7 +10,7 @@ require 'uuidtools'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative '../version'
 require_relative 'module_identification'
-require_relative 'module_quality'
+require_relative 'module_dataQuality'
 require_relative 'module_spatialOrganization'
 require_relative 'module_spatialReference'
 require_relative 'module_entityAttribute'
@@ -70,7 +70,7 @@ module ADIWG
                   # metadata (dataqual 2) - data quality
                   xDataQual = xMetadata.xpath('./dataqual')
                   unless xDataQual.empty?
-                     dataQuality = Quality.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
+                     dataQuality = DataQuality.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
                      hMetadata[:dataQuality] << dataQuality
                   end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_keyword.rb

@@ -231,9 +231,11 @@ module ADIWG
                         hCitation[:title] = thesaurus
                         hKeyword[:thesaurus] = hCitation
                      end
-                     if thesaurus.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: BIO method keyword thesaurus is missing'
-                     end
+                     # This code is being disabled intentionally. While the standard does indicate this is required, in practice it is not always present.
+                     #   Instead of requiring keywords, we will allow them to be optional for bio lineage.
+                     # if thesaurus.empty?
+                     #    hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: BIO method keyword thesaurus is missing'
+                     # end
 
                      # theme keyword bio.1.2 (methkey) - lineage method keywords {keywordObject}
                      axKeywords = xKeywords.xpath('./methkey')
@@ -247,9 +249,11 @@ module ADIWG
                            end
                         end
                      end
-                     if axKeywords.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: BIO method keyword is missing'
-                     end
+                     # This code is being disabled intentionally. While the standard does indicate this is required, in practice it is not always present.
+                     #   Instead of requiring keywords, we will allow them to be optional for bio lineage.
+                     # if axKeywords.empty?
+                     #    hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: BIO method keyword is missing'
+                     # end
 
                      aKeywords << hKeyword
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_lineage.rb

@@ -30,21 +30,15 @@ module ADIWG
                      # lineage bio (method) - methodology [] (required)
                      axMethods = xLineage.xpath('./method')
                      unless axMethods.empty?
-                        Method.unpack(hLineage, axMethods, hResponseObj)
+                        axMethods.each do |xMethod|
+                           hProcess = Method.unpack(hLineage, xMethod, hResponseObj)
+                           hLineage[:processSteps] << hProcess
+                        end
                      end
                      if axMethods.empty?
                         hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: BIO lineage methodology section is missing'
                      end
-
-                     # lineage 2.5.1 (srcinfo) - source information []
-                     axSource = xLineage.xpath('./srcinfo')
-                     unless axSource.empty?
-                        axSource.each do |xSource|
-                           hSource = Source.unpack(xSource, hResponseObj)
-                           hLineage[:dataSources] << hSource
-                        end
-                     end
-
+                     
                      # lineage 2.5.2 (procstep) - process step [] (required)
                      axProcess = xLineage.xpath('./procstep')
                      unless axProcess.empty?
@@ -57,6 +51,15 @@ module ADIWG
                         hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: lineage process step section is missing'
                      end
 
+                     # lineage 2.5.1 (srcinfo) - source information []
+                     axSource = xLineage.xpath('./srcinfo')
+                     unless axSource.empty?
+                        axSource.each do |xSource|
+                           hSource = Source.unpack(xSource, hResponseObj)
+                           hLineage[:dataSources] << hSource
+                        end
+                     end
+
                      return hLineage
 
                   end

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_methodology.rb

@@ -16,53 +16,45 @@ module ADIWG
 
             module Method
 
-               def self.unpack(hLineage, axMethods, hResponseObj)
+               def self.unpack(hLineage, xMethod, hResponseObj)
 
-                  statement = ''
                   intObj = Fgdc.get_intObj
                   hResourceInfo = intObj[:metadata][:resourceInfo]
 
-                  axMethods.each do |xMethod|
+                  intMetadataClass = InternalMetadata.new
+                  hProcessStep = intMetadataClass.newProcessStep
 
-                     # methodology bio (methtype) - method type (not supported)
+                  # methodology bio (methtype) - method type (not supported)
 
-                     # methodology bio (methodid) - method identifier [] {keyword}
-                     axKeywords = xMethod.xpath('./methodid')
-                     unless axKeywords.empty?
-                        axKeywords.each do |xKeyword|
-                           Keyword.unpack(xKeyword, hResourceInfo, hResponseObj)
-                        end
+                  # methodology bio (methodid) - method identifier [] {keyword}
+                  axKeywords = xMethod.xpath('./methodid')
+                  unless axKeywords.empty?
+                     axKeywords.each do |xKeyword|
+                        Keyword.unpack(xKeyword, hResourceInfo, hResponseObj)
                      end
+                  end
 
-                     # methodology bio (methdesc) - method description (required)
-                     description = xMethod.xpath('./methdesc').text
-                     unless description.empty?
-                        statement += description + '; '
-                     end
-                     if description.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: BIO lineage methodology description is missing'
-                     end
+                  # methodology bio (methdesc) - method description (required)
+                  description = xMethod.xpath('./methdesc').text
+                  unless description.empty?
+                     hProcessStep[:description] = description
+                  end
+                  if description.empty?
+                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: BIO lineage methodology description is missing'
+                  end
 
-                     # methodology bio (methcite) - method citation [] {citation}
-                     axCitations = xMethod.xpath('./methcite')
-                     unless axCitations.empty?
-                        axCitations.each do |xCitation|
-                           hReturn = Citation.unpack(xCitation, hResponseObj)
-                           unless hReturn.nil?
-                              hLineage[:lineageCitation] << hReturn
-                           end
+                  # methodology bio (methcite) - method citation [] {citation}
+                  axCitations = xMethod.xpath('./methcite')
+                  unless axCitations.empty?
+                     axCitations.each do |xCitation|
+                        hReturn = Citation.unpack(xCitation, hResponseObj)
+                        unless hReturn.nil?
+                           hProcessStep[:references] << hReturn
                         end
                      end
-
                   end
 
-                  unless statement.empty?
-                     statement.chomp!('; ')
-                     hLineage[:statement] = statement
-                  end
-
-                  return hLineage
-
+                  return hProcessStep
                end
             end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_process.rb

@@ -8,6 +8,7 @@ require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_dateTime'
 require_relative 'module_contact'
+require_relative 'module_citation'
 
 module ADIWG
    module Mdtranslator
@@ -37,7 +38,7 @@ module ADIWG
                      axUsed.each do |xUsed|
                         usedSrc = xUsed.text
                         unless usedSrc.empty?
-                           hLineage[:dataSources].each do |hSource|
+                           hProcess[:stepSources].each do |hSource|
                               unless hSource[:sourceId].nil?
                                  if usedSrc == hSource[:sourceId]
                                     hProcess[:stepSources] << hSource
@@ -92,6 +93,17 @@ module ADIWG
                      end
                   end
 
+                  # process (references) - references []
+                  axReferences = xProcess.xpath('./reference')
+                  unless axReferences.empty?
+                     axReferences.each do |xReference|
+                        hCitation = Citation.unpack(xReference, hResponseObj)
+                        unless hCitation.nil?
+                           hProcess[:references] << hCitation
+                        end
+                     end
+                  end
+
                   return hProcess
 
                end

data/lib/adiwg/mdtranslator/readers/mdJson/mdJson_reader.rb

@@ -95,8 +95,8 @@ module ADIWG
                aCurVersion = currentVersion.split('.')
                aReqVersion = requestedVersion.split('.')
                approved = false
-               if aReqVersion[0] == aCurVersion[0]
-                  if aReqVersion[1] <= aCurVersion[1]
+               if aReqVersion[0].to_i == aCurVersion[0].to_i
+                  if aReqVersion[1].to_i <= aCurVersion[1].to_i
                      approved = true
                   end
                end

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

@@ -8,7 +8,7 @@ module ADIWG
 
         module ConformanceResult
 
-          def self.unpack(hConformanceResult, responseObj, inContext = nil)
+          def self.unpack(hConformanceResult, responseObj)
 
             intMetadataClass = InternalMetadata.new
             intConformanceResult = intMetadataClass.newConformanceResult

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

@@ -1,5 +1,8 @@
 require_relative 'module_scope'
 require_relative 'module_spatialRepresentation'
+require_relative 'module_qualityResultFile'
+require_relative 'module_format'
+require_relative 'module_coverageDescription'
 
 module ADIWG
   module Mdtranslator
@@ -7,7 +10,7 @@ module ADIWG
       module MdJson
 
         module CoverageResult
-          def self.unpack(hResult, responseObj, inContext)
+          def self.unpack(hResult, responseObj)
 
             intMetadataClass = InternalMetadata.new
             intResult = intMetadataClass.newCoverageResult
@@ -25,7 +28,6 @@ module ADIWG
 
 
             # spatialRepresentationType
-            # https://github.com/ISO-TC211/XML/blob/master/standards.iso.org/iso/19115/resources/Codelists/gml/MD_SpatialRepresentationTypeCode.xml
             if hResult.has_key?('spatialRepresentationType')
               intResult[:spatialRepresentationType] = hResult['spatialRepresentationType']
             end
@@ -38,21 +40,20 @@ module ADIWG
 
 
             # resultContent
-            if hResult.has_key?('resultContent')
-              intResult[:resultContent] = hResult['resultContent']
+            if hResult.has_key?('resultContentDescription')
+              intResult[:resultContentDescription] = CoverageDescription.unpack(hResult['resultContentDescription'], responseObj)
             end
 
 
             # resourceFormat
             if hResult.has_key?('resourceFormat')
-              intResult[:resourceFormat] = hResult['resourceFormat']
+              intResult[:resourceFormat] = Format.unpack(hResult['resourceFormat'], responseObj)
             end
 
 
             # resultFile
-            resultFile
             if hResult.has_key?('resultFile')
-              intResult[:resultFile] = hResult['resultFile']
+              intResult[:resultFile] = QualiltyResultFile.unpack(hResult['resultFile'], responseObj)
             end
 
             return intResult

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

@@ -38,11 +38,11 @@ module ADIWG
             if hDataQuality.has_key?('standaloneQualityReport')
               hObject = hDataQuality['standaloneQualityReport']
               unless hObject.empty?
-                intDataQuality[:standaloneQualityReport] = {}
-                intDataQuality[:standaloneQualityReport][:abstract] = hObject["abstract"]
+                intDataQuality[:standaloneReport] = {}
+                intDataQuality[:standaloneReport][:abstract] = hObject["abstract"]
 
-                unless hObject["reportRefereence"].nil? || hObject["reportReference"].empty?
-                  intDataQuality[:standaloneQualityReport][:reportReference] = Citation.unpack(hObject["reportReference"], responseObj, inContext)
+                unless hObject["reportReference"].nil? || hObject["reportReference"].empty?
+                  intDataQuality[:standaloneReport][:reportReference] = Citation.unpack(hObject["reportReference"], responseObj, inContext)
                 end
               end
             end