lib/adiwg/mdtranslator/readers/mdJson/modules/module_schema.rb in adiwg-mdtranslator-2.9.2 vs lib/adiwg/mdtranslator/readers/mdJson/modules/module_schema.rb in adiwg-mdtranslator-2.10.0

@@ -1,56 +1,57 @@
 # unpack schema
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-02-19 refactored error and warning messaging
 # 	Stan Smith 2016-11-02 original script
 
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
+   module Mdtranslator
+      module Readers
+         module MdJson
 
-                module Schema
+            module Schema
 
-                    def self.unpack(hSchema, responseObj)
+               def self.unpack(hSchema, responseObj)
 
-                        # return nil object if input is empty
-                        if hSchema.empty?
-                            responseObj[:readerExecutionMessages] << 'Schema object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # return nil object if input is empty
+                  if hSchema.empty?
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: schema object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intSchema = intMetadataClass.newSchema
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intSchema = intMetadataClass.newSchema
 
-                        # schema - name (required)
-                        if hSchema.has_key?('name')
-                            intSchema[:name] = hSchema['name']
-                        end
-                        if intSchema[:name].nil? || intSchema[:name] == ''
-                            responseObj[:readerExecutionMessages] << 'Schema is missing name'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # schema - name (required)
+                  if hSchema.has_key?('name')
+                     intSchema[:name] = hSchema['name']
+                  end
+                  if intSchema[:name].nil? || intSchema[:name] == ''
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: schema name is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # schema - version (required)
-                        if hSchema.has_key?('version')
-                            intSchema[:version] = hSchema['version']
-                        end
-                        if intSchema[:version].nil? || intSchema[:version] == ''
-                            responseObj[:readerExecutionMessages] << 'Schema is missing version'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # schema - version (required)
+                  if hSchema.has_key?('version')
+                     intSchema[:version] = hSchema['version']
+                  end
+                  if intSchema[:version].nil? || intSchema[:version] == ''
+                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: schema version is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        return intSchema
+                  return intSchema
 
-                    end
+               end
 
-                end
-
             end
-        end
-    end
+
+         end
+      end
+   end
 end