adiwg
diff --git a/‎lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb
+46-7 b/‎lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb
+46-7
diff --git a/‎lib/adiwg/mdtranslator/readers/mdJson/modules/module_acquisition.rb
+133 b/‎lib/adiwg/mdtranslator/readers/mdJson/modules/module_acquisition.rb
+133
diff --git a/‎lib/adiwg/mdtranslator/readers/mdJson/modules/module_environment.rb
+47 b/‎lib/adiwg/mdtranslator/readers/mdJson/modules/module_environment.rb
+47
diff --git a/‎lib/adiwg/mdtranslator/readers/mdJson/modules/module_event.rb
+88 b/‎lib/adiwg/mdtranslator/readers/mdJson/modules/module_event.rb
+88
@@ -143,7 +143,8 @@ def newMetadata
          associatedResources: [],
          additionalDocuments: [],
          funding: [],
-         dataQuality: []
+         dataQuality: [],
+         acquisitions: []
       }
    end
 
@@ -158,6 +159,7 @@ def newSchema
    # acquisition ----------------------------
    def newAcquisition
       {
+         scope: {},
          plans: [],
          requirements: [],
          objectives: [],
@@ -175,19 +177,23 @@ def newEnvironment
          averageAirTemperature: nil,
          maxRelativeHumidity: nil,
          maxAltitude: nil,
-         meteorologicalConditions: nil
+         meteorologicalConditions: nil,
+         solarAzimuth: nil,
+         solarElevation: nil
+         
       }
    end
 
    def newEvent
       {
          eventId: nil,
+         identifier: {},
          trigger: nil,
          context: nil,
          sequence: nil,
          dateTime: nil,
          expectedObjectives: [],
-         relatedPass: nil,
+         relatedPass: {},
          relatedSensors: []
       }
    end
@@ -199,7 +205,29 @@ def newInstrument
          identifier: {},
          instrumentType: nil,
          description: nil,
-         mountedOn: nil
+         mountedOn: {},
+         histories: [],
+         hostId: {}
+      }
+   end
+
+   def newInstrumentationEvent
+      {
+         citations: [],
+         description: nil,
+         extent: {},
+         eventType: nil,
+         revisionHistories: [],
+      }
+   end
+
+   def newInstrumentationEventList
+      {
+         citation: {},
+         description: nil,
+         locale: {},
+         constraints: [],
+         instrumentationEvents: []
       }
    end
 
@@ -240,14 +268,15 @@ def newPlan
    def newOperation
       {
          operationId: nil,
+         description: nil,
          citation: {},
          identifier: {},
          status: nil,
          operationType: nil,
          objectives: [],
-         parentOperations: nil,
+         parentOperation: {},
          childOperations: [],
-         plan: nil,
+         plan: {},
          platforms: [],
          significantEvents: []
       }
@@ -267,14 +296,23 @@ def newRequirement
       }
    end
 
+   def newRevision
+      {
+         description: nil,
+         responsibleParty: {},
+         dateInfo: []
+      }
+   end
+
    def newPlatform
       {
          platformId: nil,
          citation: {},
          identifier: {},
          description: nil,
          sponsors: [],
-         instruments: []
+         instruments: [],
+         history: []
       }
    end
 
@@ -541,6 +579,7 @@ def newImageDescription
    # data dictionary ------------------------
    def newDataDictionary
       {
+         dictionaryId: nil,
          description: nil,
          subjects: [],
          citation: {},
 
@@ -0,0 +1,133 @@
+require_relative 'module_scope'
+require_relative 'module_objective'
+require_relative 'module_requirement'
+require_relative 'module_platform'
+require_relative 'module_instrument'
+require_relative 'module_operation'
+require_relative 'module_pass'
+require_relative 'module_event'
+require_relative 'module_environment'
+require_relative 'module_plan'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module MdJson
+ 
+            module Acquisition
+ 
+               def self.unpack(hAcquisition, responseObj, inContext = nil)
+ 
+                  @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+                  outContext = 'acquisition'
+                  outContext = inContext + ' > ' + outContext unless inContext.nil?
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intAcquisition = intMetadataClass.newAcquisition
+ 
+                  if hAcquisition.has_key?('scope')
+                     unless hAcquisition['scope'].empty?
+                        hReturn = Scope.unpack(hAcquisition['scope'], responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:scope] = hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('plan')
+                     aItems = hAcquisition['plan']
+                     aItems.each do |item|
+                        hReturn = Plan.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:plans] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('requirement')
+                     aItems = hAcquisition['requirement']
+                     aItems.each do |item|
+                        hReturn = Requirement.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:requirements] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('objective')
+                     aItems = hAcquisition['objective']
+                     aItems.each do |item|
+                        hReturn = Objective.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:objectives] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('platform')
+                     aItems = hAcquisition['platform']
+                     aItems.each do |item|
+                        hReturn = Platform.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:platforms] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('instrument')
+                     aItems = hAcquisition['instrument']
+                     aItems.each do |item|
+                        hReturn = Instrument.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:instruments] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('operation')
+                     aItems = hAcquisition['operation']
+                     aItems.each do |item|
+                        hReturn = Operation.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:operations] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('event')
+                     aItems = hAcquisition['event']
+                     aItems.each do |item|
+                        hReturn = Event.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:events] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('pass')
+                     aItems = hAcquisition['pass']
+                     aItems.each do |item|
+                        hReturn = Pass.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:passes] << hReturn
+                        end
+                     end
+                  end
+                  
+                  if hAcquisition.has_key?('environment')
+                     intAcquisition[:environment] = Environment.unpack(hAcquisition['environment'], responseObj, outContext)
+                  end
+                  
+                  return intAcquisition
+
+               end
+
+            end
+ 
+         end
+      end
+   end
+end
+ 
@@ -0,0 +1,47 @@
+module ADIWG
+    module Mdtranslator
+        module Readers
+            module MdJson
+  
+                module Environment
+                    def self.unpack(hEnvironment, responseObj, inContext = nil)
+
+                        intMetadataClass = InternalMetadata.new
+                        intEnvironment = intMetadataClass.newEnvironment
+
+                        outContext = 'environment'
+                        outContext = inContext + ' > ' + outContext unless inContext.nil?
+
+                        if hEnvironment.has_key?('averageAirTemperature')
+                            intEnvironment[:averageAirTemperature] = hEnvironment['averageAirTemperature']
+                        end
+
+                        if hEnvironment.has_key?('maxRelativeHumidity')
+                            intEnvironment[:maxRelativeHumidity] = hEnvironment['maxRelativeHumidity']
+                        end
+
+                        if hEnvironment.has_key?('maxAltitude')
+                            intEnvironment[:maxAltitude] = hEnvironment['maxAltitude']
+                        end
+
+                        if hEnvironment.has_key?('meteorologicalConditions')
+                            intEnvironment[:meteorologicalConditions] = hEnvironment['meteorologicalConditions']
+                        end
+
+                        if hEnvironment.has_key?('solarAzimuth')
+                            intEnvironment[:solarAzimuth] = hEnvironment['solarAzimuth']
+                        end
+
+                        if hEnvironment.has_key?('solarElevation')
+                            intEnvironment[:solarElevation] = hEnvironment['solarElevation']
+                        end
+
+                        intEnvironment
+
+                    end
+                end
+
+            end
+        end
+    end
+end
@@ -0,0 +1,88 @@
+require_relative 'module_identifier'
+require_relative 'module_dateTime'
+require_relative 'module_objective'
+require_relative 'module_pass'
+require_relative 'module_instrument'
+
+module ADIWG
+    module Mdtranslator
+        module Readers
+            module MdJson
+  
+                module Event
+                    def self.unpack(hEvent, responseObj, inContext = nil)
+                        @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+                        intMetadataClass = InternalMetadata.new
+                        intEvent = intMetadataClass.newEvent
+
+                        outContext = 'Event'
+                        outContext = inContext + ' > ' + outContext unless inContext.nil?
+
+                        if hEvent.has_key?('eventId')
+                            intEvent[:eventId] = hEvent['eventId']
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('identifier')
+                            intEvent[:identifier] = Identifier.unpack(hEvent['identifier'], responseObj, outContext)
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('trigger')
+                            intEvent[:trigger] = hEvent['trigger']
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('context')
+                            intEvent[:context] = hEvent['context']
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('sequence')
+                            intEvent[:sequence] = hEvent['sequence']
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext,)
+                        end
+
+                        if hEvent.has_key?('time')
+                            intEvent[:time] = DateTime.unpack(hEvent['time'], responseObj, outContext)
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('expectedObjective')
+                            hEvent['expectedObjective'].each do |item|
+                                hReturn = Objective.unpack(item, responseObj, outContext)
+                                unless hReturn.nil?
+                                    intEvent[:expectedObjectives] << hReturn
+                                end
+                            end
+                        end
+
+                        if hEvent.has_key?('relatedPass')
+                            intEvent[:relatedPass] = Pass.unpack(hEvent['relatedPass'], responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('relatedSensor')
+                            hEvent['relatedSensor'].each do |item|
+                                hReturn = Instrument.unpack(item, responseObj, outContext)
+                                unless hReturn.nil?
+                                    intEvent[:relatedSensors] << hReturn
+                                end
+                            end
+                        end
+
+                        intEvent
+
+                    end
+                end
+
+            end
+        end
+    end
+end