module_domain.rb in adiwg-mdtranslator-2.10.0

- old
+ new

@@ -1,9 +1,10 @@
 # unpack a data dictionary domain
 # Reader - ADIwg JSON V1 to internal data structure
 
 # History:
+#  Stan Smith 2018-02-18 refactored error and warning messaging
 #  Stan Smith 2017-11-01 added domainReference
 #  Stan Smith 2016-10-07 refactored for mdJson 2.0
 #  Stan Smith 2015-07-23 added error reporting of missing items
 #  Stan Smith 2015-07-14 refactored to remove global namespace constants
 #  Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
@@ -22,12 +23,11 @@
 
                def self.unpack(hDomain, responseObj)
 
                   # return nil object if input is empty
                   if hDomain.empty?
-                     responseObj[:readerExecutionMessages] << 'Domain Member object is empty'
-                     responseObj[:readerExecutionPass] = false
+                     responseObj[:readerExecutionMessages] << 'WARNING: mdJson reader: data dictionary domain object is empty'
                      return nil
                   end
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -36,11 +36,11 @@
                   # data dictionary domain - id (required)
                   if hDomain.has_key?('domainId')
                      intDomain[:domainId] = hDomain['domainId']
                   end
                   if intDomain[:domainId].nil? || intDomain[:domainId] == ''
-                     responseObj[:readerExecutionMessages] << 'Data Dictionary domain ID is missing'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: data dictionary domain ID is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
 
                   # data dictionary domain - name
@@ -53,20 +53,20 @@
                   # data dictionary domain - code (required)
                   if hDomain.has_key?('codeName')
                      intDomain[:domainCode] = hDomain['codeName']
                   end
                   if intDomain[:domainCode].nil? || intDomain[:domainCode] == ''
-                     responseObj[:readerExecutionMessages] << 'Data Dictionary domain code name is missing'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: data dictionary domain code is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
 
                   # data dictionary domain - description (required)
                   if hDomain.has_key?('description')
                      intDomain[:domainDescription] = hDomain['description']
                   end
                   if intDomain[:domainDescription].nil? || intDomain[:domainDescription] == ''
-                     responseObj[:readerExecutionMessages] << 'Data Dictionary domain description is missing'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: data dictionary domain description is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
 
                   # data dictionary domain - domain reference {citation}