Changeset 31935

Timestamp:

Jul 25, 2011, 4:19:47 PM (15 years ago)

Author:

rhenders

Message:

new method to check for header value and replace it with supplied default if and only if in test mode; also now reporting all missing dictionary fields

File:

• trunk/ippToPsps/jython/batch.py (modified) (2 diffs)

trunk/ippToPsps/jython/batch.py

@@ -128 +128 @@
 
     '''
+    Looks for a dictionary entry. If it is not there, then replaces it with the supplied default
+    if, and only if, in test mode
+    '''
+    def safeDictionaryAccessWithDefault(self, header, key, default):
+
+         value = self.safeDictionaryAccess(header, key)
+
+         if value != "NULL": return value
+         else:
+             if not self.testMode: return "NULL"
+             header[key] = default
+             self.logger.infoPair("Hardcoding " + key + " to", header[key])
+             return header[key]
+
+    '''
     Returns the string value from this dictionary or else "NULL"
     '''
@@ -133 +148 @@
 
          if key in header: return header[key]
-         else: return "NULL"
+         else:
+             self.logger.errorPair("Missing header field", key)
+             return "NULL"
 
     '''