module_resourceUsage.rb in adiwg-mdtranslator-2.13.1

- old
+ new

@@ -1,10 +1,10 @@
 # unpack resource usage
 # Reader - ADIwg JSON V1 to internal data structure
 
 # History:
-#  Stan Smith 2018-02-19 refactored error and warning messaging
+#  Stan Smith 2018-06-24 refactored error and warning messaging
 #  Stan Smith 2016-10-11 refactored for mdJson 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-07-03 resolve require statements using Mdtranslator.reader_module
@@ -23,13 +23,15 @@
 
             module ResourceUsage
 
                def self.unpack(hUsage, responseObj)
 
+                  @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
                   # return nil object if input is empty
                   if hUsage.empty?
-                     responseObj[:readerExecutionMessages] << 'WARNING: mdJson reader: resource usage object is empty'
+                     @MessagePath.issueWarning(700, responseObj)
                      return nil
                   end
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -38,12 +40,10 @@
                   # resource usage - specific usage (required)
                   if hUsage.has_key?('specificUsage')
                      intUsage[:specificUsage] = hUsage['specificUsage']
                   end
                   if intUsage[:specificUsage].nil? || intUsage[:specificUsage] == ''
-                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: resource usage specific usage is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
+                     @MessagePath.issueError(701, responseObj)
                   end
 
                   # resource usage - temporal extent []
                   if hUsage.has_key?('temporalExtent')
                      aItems = hUsage['temporalExtent']