adiwg-mdtranslator 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f08c8cabea92742e77f01c30ae68550da7a583d
-  data.tar.gz: 8963e33ca95184476f15d4c8e94834b3466c9c08
+  metadata.gz: 237525902d612d3bf3f8c5a81c373a789d27b9c8
+  data.tar.gz: caa5edd6722337501c2698e0ea7ee4a61b0eccea
 SHA512:
-  metadata.gz: '09dd47945d0989ceaa90dbc46a435af71f4d1f36ce8d54f5e81d02ed57d64ee8a9c75af7dcbded016f9b47fd72b2bf7181c7479a3f06905911051f5b047c866f'
-  data.tar.gz: 85cba08c6d6dadae7eb549cca69a08d3a2323924ebae6ce4b8faca4483f182484c25b4f5301f855bb21694b5de2868610435c3e4bfad4a9fae7af5ef018eebe3
+  metadata.gz: 79a9d0abadec138c139b287b3e306033eee12b9d0467b1ee0ce3e010a121f1aff03b88e4e715f05147ea48e58c277eea536631e88142f430eace7f6e6a37779a
+  data.tar.gz: c459062d8d426ac181db0cc1f279811d5567e773c9f1bec809c3487e96920fcb11dad897343a60411ee8f7de31ea2986924953f09a295cf485c7e48bbc65e7e8

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [v2.5.0](https://github.com/adiwg/mdTranslator/tree/v2.5.0) (2017-11-06)
+## [v2.6.0](https://github.com/adiwg/mdTranslator/tree/v2.6.0) (2017-11-10)
+
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.5.0...v2.6.0)
+
+**Fixed bugs:**
+
+- mdJSON reader version is stale [\#158](https://github.com/adiwg/mdTranslator/issues/158)
 
+**Merged pull requests:**
+
+- Add Geologic Age to timeInstant and timePeriod [\#161](https://github.com/adiwg/mdTranslator/pull/161) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.5.0](https://github.com/adiwg/mdTranslator/tree/v2.5.0) (2017-11-06)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.4.0...v2.5.0)
 
 **Fixed bugs:**

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

@@ -534,7 +534,8 @@ class InternalMetadata
          description: nil,
          identifier: {},
          instantNames: [],
-         timeInstant: {}
+         timeInstant: {},
+         geologicAge: {}
       }
    end
 
@@ -559,7 +560,7 @@ class InternalMetadata
          ageEstimate: nil,
          ageUncertainty: nil,
          ageExplanation: nil,
-         ageReference: []
+         ageReferences: []
       }
    end
 
@@ -712,8 +713,9 @@ class InternalMetadata
 
    def newDataDictionary
       {
-         citation: {},
+         description: nil,
          subjects: [],
+         citation: {},
          recommendedUses: [],
          locales: [],
          responsibleParty: {},

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

@@ -23,7 +23,7 @@ module ADIWG
                   hDateTime = intMetadataClass.newDateTime
 
                   if date.nil? || date == ''
-                     hResponseObj[:readerExecutionMessages] << 'date string is missing from dateTime conversion'
+                     hResponseObj[:readerExecutionMessages] << 'date string is missing from dateTime'
                      hResponseObj[:readerExecutionPass] = false
                      return nil
                   end
@@ -74,12 +74,12 @@ module ADIWG
                   else
                      timeOffset = Time.now.gmt_offset
                      aOffset = timeOffset.divmod(3600)
-                     hOffset = aOffset[0]
-                     mOffset = aOffset[1] * 60
-                     if hOffset >= 0
-                        zone = '+' + '%02d' % hOffset + ':' + '%02d' % mOffset
+                     hourOff = aOffset[0]
+                     minOff = aOffset[1] * 60
+                     if hourOff >= 0
+                        zone = '+' + '%02d' % hourOff + ':' + '%02d' % minOff
                      else
-                        zone = '%03d' % hOffset + ':' + '%02d' % mOffset
+                        zone = '%03d' % hourOff + ':' + '%02d' % minOff
                      end
                      dtIn = dtIn + zone
                   end

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

@@ -0,0 +1,66 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc bio geologic age
+
+# History:
+#  Stan Smith 2017-11-06 original script
+
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative 'module_citation'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module GeologicAge
+
+               def self.unpack(xGeoAge, hResponseObj)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intGeoAge = intMetadataClass.newGeologicAge
+
+                  # geologic age bio (geolscal) - time scale (required)
+                  scale = xGeoAge.xpath('./geolscal').text
+                  unless scale.empty?
+                     intGeoAge[:ageTimeScale] = scale
+                  end
+
+                  # geologic age bio (geolest) - age estimate (required)
+                  estimate = xGeoAge.xpath('./geolest').text
+                  unless estimate.empty?
+                     intGeoAge[:ageEstimate] = estimate
+                  end
+
+                  # geologic age bio (geolun) - age estimate uncertainty
+                  uncertain = xGeoAge.xpath('./geolun').text
+                  unless uncertain.empty?
+                     intGeoAge[:ageUncertainty] = uncertain
+                  end
+
+                  # geologic age bio (geolexpl) - explanation
+                  explain = xGeoAge.xpath('./geolexpl').text
+                  unless explain.empty?
+                     intGeoAge[:ageExplanation] = explain
+                  end
+
+                  # geologic age bio (geolcit) - age references [] {citation}
+                  axReferences = xGeoAge.xpath('./geolcit')
+                  unless axReferences.empty?
+                     axReferences.each do |xCitation|
+                        hCitation = Citation.unpack(xCitation, hResponseObj)
+                        intGeoAge[:ageReferences] << hCitation unless hCitation.nil?
+                     end
+                  end
+
+                  return intGeoAge
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -60,20 +60,18 @@ module ADIWG
                   xTimePeriod = xIdInfo.xpath('./timeperd')
                   unless xTimePeriod.empty?
 
-                     # time period for single date and date range
+                     # time period for single date, multi-date, and date range {resource timePeriod}
                      hTimePeriod = TimePeriod.unpack(xTimePeriod, hResponseObj)
                      hResourceInfo[:timePeriod] = hTimePeriod unless hTimePeriod.nil?
 
-                     # time period multiple date time pairs 9.1.2 (mdattim)
+                     # time period multi-date also placed in temporalExtent
                      axMultiple = xTimePeriod.xpath('./timeinfo/mdattim/sngdate')
                      unless axMultiple.empty?
                         current = xTimePeriod.xpath('./current').text
                         hExtent = intMetadataClass.newExtent
-                        hExtent[:description] = 'FGDC resource time period multiple date/times'
+                        hExtent[:description] = 'FGDC resource time period for multiple date/times/geological age'
                         axMultiple.each do |xDateTime|
-                           date = xDateTime.xpath('./caldate').text
-                           time = xDateTime.xpath('./time').text
-                           hInstant = TimeInstant.unpack(date, time, hResponseObj)
+                           hInstant = TimeInstant.unpack(xDateTime, hResponseObj)
                            unless hInstant.nil?
                               hTempExtent = intMetadataClass.newTemporalExtent
                               hInstant[:description] = current

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

@@ -2,11 +2,13 @@
 # unpack fgdc time instant
 
 # History:
+#  Stan Smith 2017-11-07 add geologic age
 #  Stan Smith 2017-08-21 original script
 
 require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_dateTime'
+require_relative 'module_geologicAge'
 
 module ADIWG
    module Mdtranslator
@@ -15,17 +17,32 @@ module ADIWG
 
             module TimeInstant
 
-               def self.unpack(date, time, hResponseObj)
+               def self.unpack(xDateTime, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
                   hTimeInstant = intMetadataClass.newTimeInstant
 
-                  # time instant
-                  hDateTime = DateTime.unpack(date, time, hResponseObj)
-                  unless hDateTime.nil?
-                     hTimeInstant[:timeInstant] = hDateTime
-                     return hTimeInstant
+                  date = xDateTime.xpath('./caldate').text
+                  time = xDateTime.xpath('./time').text
+                  xGeoAge = xDateTime.xpath('./geolage')
+
+                  # time instant - date-time
+                  unless date.empty?
+                     hDateTime = DateTime.unpack(date, time, hResponseObj)
+                     unless hDateTime.nil?
+                        hTimeInstant[:timeInstant] = hDateTime
+                        return hTimeInstant
+                     end
+                  end
+
+                  # time instant - geological age
+                  unless xGeoAge.empty?
+                     hGeoAge = GeologicAge.unpack(xGeoAge, hResponseObj)
+                     unless hGeoAge.nil?
+                        hTimeInstant[:geologicAge] = hGeoAge
+                        return hTimeInstant
+                     end
                   end
 
                   return nil

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

@@ -2,11 +2,13 @@
 # unpack fgdc time period
 
 # History:
+#  Stan Smith 2017-11-06 add geologic time
 #  Stan Smith 2017-08-17 original script
 
 require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_dateTime'
+require_relative 'module_geologicAge'
 
 module ADIWG
    module Mdtranslator
@@ -25,13 +27,12 @@ module ADIWG
                   xTimeInfo = xTimePeriod.xpath('./timeinfo')
 
                   # current may have different element tags depending on timePeriod source
-                  current = nil?
-                  xFoundIt = xTimePeriod.at('./current')
-                  if xFoundIt.nil?
-                     xFoundIt = xTimePeriod.at('./srccurr')
+                  xCurrent = xTimePeriod.at('./current')
+                  if xCurrent.nil?
+                     xCurrent = xTimePeriod.at('./srccurr')
                   end
-                  unless xFoundIt.nil?
-                     current = xFoundIt.text
+                  unless xCurrent.nil?
+                     hTimePeriod[:description] = xCurrent.text
                   end
 
                   unless xTimeInfo.empty?
@@ -43,36 +44,80 @@ module ADIWG
                         # single date 9.1.1/9.1.2 (caldate/time) - single date/time {date} (required) {time}
                         date = xSingle.xpath('./caldate').text
                         time = xSingle.xpath('./time').text
-                        hDateTime = DateTime.unpack(date, time, hResponseObj)
-                        unless hDateTime.nil?
-                           hTimePeriod[:endDateTime] = hDateTime
+                        unless date.empty?
+                           hDateTime = DateTime.unpack(date, time, hResponseObj)
+                           unless hDateTime.nil?
+                              hTimePeriod[:endDateTime] = hDateTime
+                              return hTimePeriod
+                           end
                         end
-                        hTimePeriod[:description] = current
 
-                        return hTimePeriod
+                        # or bio extension's geologic age
+                        xGeoAge = xSingle.xpath('./geolage')
+                        unless xGeoAge.empty?
+                           hGeoAge = GeologicAge.unpack(xGeoAge, hResponseObj)
+                           unless hGeoAge.nil?
+                              hTimePeriod[:endGeologicAge] = hGeoAge
+                              return hTimePeriod
+                           end
+                        end
 
                      end
 
                      # time period 9.2 (mdattim) - multiple date times
-                     # take first date
                      xMulti = xTimeInfo.xpath('./mdattim')
                      unless xMulti.empty?
-                        axSingle = xMulti.xpath('./sngdate')
 
-                        # use first occurrence of the multiple date times
-                        unless axSingle.empty?
-                           xSingle = axSingle[0]
-                           date = xSingle.xpath('./caldate').text
-                           time = xSingle.xpath('./time').text
-                           hDateTime = DateTime.unpack(date, time, hResponseObj)
-                           unless hDateTime.nil?
-                              hTimePeriod[:startDateTime] = hDateTime
+                        # use first occurrence of the multiple date-times as start date
+                        xStart = xMulti.xpath('//sngdate').first
+                        startDate = xStart.xpath('./caldate').text
+                        startTime = xStart.xpath('./time').text
+                        unless startDate.empty?
+                           hStartDateTime = DateTime.unpack(startDate, startTime, hResponseObj)
+                           unless hStartDateTime.nil?
+                              hTimePeriod[:startDateTime] = hStartDateTime
+                           end
+                        end
+
+                        # use last occurrence of the multiple date-times as end date
+                        xEnd = xMulti.xpath('//sngdate').last
+                        endDate = xEnd.xpath('./caldate').text
+                        endTime = xEnd.xpath('./time').text
+                        unless endDate.empty?
+                           hEndDateTime = DateTime.unpack(endDate, endTime, hResponseObj)
+                           unless hEndDateTime.nil?
+                              hTimePeriod[:endDateTime] = hEndDateTime
+                           end
+                        end
+
+                        # and/or bio extension's geologic age
+                        axGeoAge = xMulti.xpath('//geolage')
+                        unless axGeoAge.empty?
+
+                           # use first occurrence of the multiple geologic age as start age
+                           xGeoAge = axGeoAge.xpath('//geolage').first
+                           unless xGeoAge.nil?
+                              hGeoAge = GeologicAge.unpack(xGeoAge, hResponseObj)
+                              unless hGeoAge.nil?
+                                 hTimePeriod[:startGeologicAge] = hGeoAge
+                              end
                            end
-                           hTimePeriod[:description] = current
 
-                           return hTimePeriod
+                           # use lase occurrence of the multiple geologic age as end age
+                           if axGeoAge.length > 1
+                              xGeoAge = axGeoAge.xpath('//geolage').last
+                              unless xGeoAge.nil?
+                                 hGeoAge = GeologicAge.unpack(xGeoAge, hResponseObj)
+                                 unless hGeoAge.nil?
+                                    hTimePeriod[:endGeologicAge] = hGeoAge
+                                 end
+                              end
+                           end
 
                         end
+
+                        return hTimePeriod
+
                      end
 
                      # time period 9.3 (rngdates) - range of dates
@@ -96,7 +141,25 @@ module ADIWG
                         unless hDateTime.nil?
                            hTimePeriod[:endDateTime] = hDateTime
                         end
-                        hTimePeriod[:description] = current
+
+                        # and/or bio extension's geologic age
+                        # start geologic age
+                        xBegGeoAge = xRange.xpath('./beggeol')
+                        unless xBegGeoAge.empty?
+                           hGeoAge = GeologicAge.unpack(xBegGeoAge, hResponseObj)
+                           unless hGeoAge.nil?
+                              hTimePeriod[:startGeologicAge] = hGeoAge
+                           end
+                        end
+
+                        # end geologic age
+                        xEndGeoAge = xRange.xpath('./endgeol')
+                        unless xEndGeoAge.empty?
+                           hGeoAge = GeologicAge.unpack(xEndGeoAge, hResponseObj)
+                           unless hGeoAge.nil?
+                              hTimePeriod[:endGeologicAge] = hGeoAge
+                           end
+                        end
 
                         return hTimePeriod
 

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

@@ -2,10 +2,11 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
-#   Stan Smith 2017-01-20 refactored for mdJson/mdTranslator 2.0
-#   Stan Smith 2015-07-14 refactored to remove global namespace constants
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
-#   Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
+#  Stan Smith 2017-11-09 add dictionary description
+#  Stan Smith 2017-01-20 refactored for mdJson/mdTranslator 2.0
+#  Stan Smith 2015-07-14 refactored to remove global namespace constants
+#  Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
+#  Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
 # 	Stan Smith 2014-12-01 original script
 
 require_relative 'module_citation'
@@ -15,137 +16,145 @@ require_relative 'module_locale'
 require_relative 'module_responsibleParty'
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
-
-                module DataDictionary
-
-                    def self.unpack(hDictionary, responseObj)
-
-                        # return nil object if input is empty
-                        if hDictionary.empty?
-                            responseObj[:readerExecutionMessages] << 'Data Dictionary object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intDictionary = intMetadataClass.newDataDictionary
-
-                        # dictionary - citation (required by mdJson) {citation}
-                        if hDictionary.has_key?('citation')
-                            hCitation = hDictionary['citation']
-                            unless hCitation.empty?
-                                hReturn = Citation.unpack(hCitation, responseObj)
-                                unless hReturn.nil?
-                                    intDictionary[:citation] = hReturn
-                                end
-                            end
-                        end
-                        if intDictionary[:citation].empty?
-                            responseObj[:readerExecutionMessages] << 'Data Dictionary citation is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # dictionary - subject [] (required)
-                        if hDictionary.has_key?('subject')
-                            aSubjects = hDictionary['subject']
-                            aSubjects.each do |item|
-                                if item != ''
-                                    intDictionary[:subjects] << item
-                                end
-                            end
-                        end
-                        if intDictionary[:subjects].empty?
-                            responseObj[:readerExecutionMessages] << 'Data Dictionary subject is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # dictionary - recommended use []
-                        if hDictionary.has_key?('recommendedUse')
-                            aUses = hDictionary['recommendedUse']
-                            aUses.each do |item|
-                                if item != ''
-                                    intDictionary[:recommendedUses] << item
-                                end
-                            end
+   module Mdtranslator
+      module Readers
+         module MdJson
+
+            module DataDictionary
+
+               def self.unpack(hDictionary, responseObj)
+
+                  # return nil object if input is empty
+                  if hDictionary.empty?
+                     responseObj[:readerExecutionMessages] << 'Data Dictionary object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intDictionary = intMetadataClass.newDataDictionary
+
+                  # dictionary - description
+                  if hDictionary.has_key?('description')
+                     s = hDictionary['description']
+                     unless s == ''
+                        intDictionary[:description] = s
+                     end
+                  end
+
+                  # dictionary - citation (required by mdJson) {citation}
+                  if hDictionary.has_key?('citation')
+                     hCitation = hDictionary['citation']
+                     unless hCitation.empty?
+                        hReturn = Citation.unpack(hCitation, responseObj)
+                        unless hReturn.nil?
+                           intDictionary[:citation] = hReturn
                         end
-
-                        # dictionary - locale [] {locale}
-                        if hDictionary.has_key?('locale')
-                            aLocales = hDictionary['locale']
-                            aLocales.each do |hItem|
-                                hReturn = Locale.unpack(hItem, responseObj)
-                                unless hReturn.nil?
-                                    intDictionary[:locales] << hReturn
-                                end
-                            end
+                     end
+                  end
+                  if intDictionary[:citation].empty?
+                     responseObj[:readerExecutionMessages] << 'Data Dictionary citation is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # dictionary - subject [] (required)
+                  if hDictionary.has_key?('subject')
+                     aSubjects = hDictionary['subject']
+                     aSubjects.each do |item|
+                        if item != ''
+                           intDictionary[:subjects] << item
                         end
-
-                        # dictionary - responsible party (required) {responsibleParty}
-                        if hDictionary.has_key?('responsibleParty')
-                            hRParty = hDictionary['responsibleParty']
-                            unless hRParty.empty?
-                                hReturn = ResponsibleParty.unpack(hRParty, responseObj)
-                                unless hReturn.nil?
-                                    intDictionary[:responsibleParty] = hReturn
-                                end
-                            end
+                     end
+                  end
+                  if intDictionary[:subjects].empty?
+                     responseObj[:readerExecutionMessages] << 'Data Dictionary subject is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # dictionary - recommended use []
+                  if hDictionary.has_key?('recommendedUse')
+                     aUses = hDictionary['recommendedUse']
+                     aUses.each do |item|
+                        if item != ''
+                           intDictionary[:recommendedUses] << item
                         end
-                        if intDictionary[:responsibleParty].empty?
-                            responseObj[:readerExecutionMessages] << 'Data Dictionary responsible party is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # dictionary - dictionary format
-                        if hDictionary.has_key?('dictionaryFormat')
-                            s = hDictionary['dictionaryFormat']
-                            unless s == ''
-                                intDictionary[:dictionaryFormat] = s
-                            end
+                     end
+                  end
+
+                  # dictionary - locale [] {locale}
+                  if hDictionary.has_key?('locale')
+                     aLocales = hDictionary['locale']
+                     aLocales.each do |hItem|
+                        hReturn = Locale.unpack(hItem, responseObj)
+                        unless hReturn.nil?
+                           intDictionary[:locales] << hReturn
                         end
-
-                        # dictionary - dictionary included with resource
-                        if hDictionary.has_key?('dictionaryIncludedWithResource')
-                            if hDictionary['dictionaryIncludedWithResource'] === true
-                                intDictionary[:includedWithDataset] = hDictionary['dictionaryIncludedWithResource']
-                            end
+                     end
+                  end
+
+                  # dictionary - responsible party (required) {responsibleParty}
+                  if hDictionary.has_key?('responsibleParty')
+                     hRParty = hDictionary['responsibleParty']
+                     unless hRParty.empty?
+                        hReturn = ResponsibleParty.unpack(hRParty, responseObj)
+                        unless hReturn.nil?
+                           intDictionary[:responsibleParty] = hReturn
                         end
-
-                        # dictionary - domains [] {domain}
-                        if hDictionary.has_key?('domain')
-                            aDomains = hDictionary['domain']
-                            aDomains.each do |hItem|
-                                hReturn = Domain.unpack(hItem, responseObj)
-                                unless hReturn.nil?
-                                    intDictionary[:domains] << hReturn
-                                end
-                            end
+                     end
+                  end
+                  if intDictionary[:responsibleParty].empty?
+                     responseObj[:readerExecutionMessages] << 'Data Dictionary responsible party is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # dictionary - dictionary format
+                  if hDictionary.has_key?('dictionaryFormat')
+                     s = hDictionary['dictionaryFormat']
+                     unless s == ''
+                        intDictionary[:dictionaryFormat] = s
+                     end
+                  end
+
+                  # dictionary - dictionary included with resource
+                  if hDictionary.has_key?('dictionaryIncludedWithResource')
+                     if hDictionary['dictionaryIncludedWithResource'] === true
+                        intDictionary[:includedWithDataset] = hDictionary['dictionaryIncludedWithResource']
+                     end
+                  end
+
+                  # dictionary - domains [] {domain}
+                  if hDictionary.has_key?('domain')
+                     aDomains = hDictionary['domain']
+                     aDomains.each do |hItem|
+                        hReturn = Domain.unpack(hItem, responseObj)
+                        unless hReturn.nil?
+                           intDictionary[:domains] << hReturn
                         end
-
-                        # dictionary - entity [] {entity}
-                        if hDictionary.has_key?('entity')
-                            aEntities = hDictionary['entity']
-                            aEntities.each do |hItem|
-                                hReturn = Entity.unpack(hItem, responseObj)
-                                unless hReturn.nil?
-                                    intDictionary[:entities] << hReturn
-                                end
-                            end
+                     end
+                  end
+
+                  # dictionary - entity [] {entity}
+                  if hDictionary.has_key?('entity')
+                     aEntities = hDictionary['entity']
+                     aEntities.each do |hItem|
+                        hReturn = Entity.unpack(hItem, responseObj)
+                        unless hReturn.nil?
+                           intDictionary[:entities] << hReturn
                         end
+                     end
+                  end
 
-                        return intDictionary
+                  return intDictionary
 
-                    end
-
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end