module_domainItem.rb in adiwg-mdtranslator-2.10.0

- old
+ new

@@ -1,9 +1,10 @@
 # unpack a data dictionary domain item
 # Reader - ADIwg JSON V1 to internal data structure
 
 # History:
+#  Stan Smith 2018-02-18 refactored error and warning messaging
 #  Stan Smith 2018-01-24 add domain item reference
 #  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)
@@ -21,12 +22,11 @@
 
                def self.unpack(hDomItem, responseObj)
 
                   # return nil object if input is empty
                   if hDomItem.empty?
-                     responseObj[:readerExecutionMessages] << 'Domain Member object is empty'
-                     responseObj[:readerExecutionPass] = false
+                     responseObj[:readerExecutionMessages] << 'WARNING: mdJson reader: data dictionary domain item object is empty'
                      return nil
                   end
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -35,30 +35,30 @@
                   # data dictionary domain item - name (required)
                   if hDomItem.has_key?('name')
                      intItem[:itemName] = hDomItem['name']
                   end
                   if intItem[:itemName].nil? || intItem[:itemName] == ''
-                     responseObj[:readerExecutionMessages] << 'Data Dictionary domain item name is missing'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: data dictionary domain item name is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
 
                   # data dictionary domain item - value (required)
                   if hDomItem.has_key?('value')
                      intItem[:itemValue] = hDomItem['value']
                   end
                   if intItem[:itemValue].nil? || intItem[:itemValue] == ''
-                     responseObj[:readerExecutionMessages] << 'Data Dictionary domain item value is missing'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: data dictionary domain item value is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
 
                   # data dictionary domain item - definition (required)
                   if hDomItem.has_key?('definition')
                      intItem[:itemDefinition] = hDomItem['definition']
                   end
                   if intItem[:itemDefinition].nil? || intItem[:itemDefinition] == ''
-                     responseObj[:readerExecutionMessages] << 'Data Dictionary domain item definition is missing'
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: data dictionary domain item definition is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
 
                   # data dictionary domain item - reference {citation}