Changeset 4636 for exist/trunk/python/ndgUtils/lib/atomvalidator.py

Timestamp:

15/12/08 11:54:42 (12 years ago)

Author:

cbyrom

Message:

Add range validation - i.e. checking max/min values correct way around
+ separate out error messages as class constants to allow checking with
tests.

File:

• exist/trunk/python/ndgUtils/lib/atomvalidator.py (modified) (5 diffs)

exist/trunk/python/ndgUtils/lib/atomvalidator.py

@@ -23 +23 @@
     Exception handling for validation.
     """
+    BASE_MESSAGE = 'Data validation error'
     def __init__(self, errorDict):
-        msg = "Data validation error"
-        logging.error(msg)
-        Exception.__init__(self, msg)
+        logging.error(self.BASE_MESSAGE)
+        Exception.__init__(self, self.BASE_MESSAGE)
         for val in errorDict.itervalues():
             logging.error(val)
@@ -53 +53 @@
     
     NEW_LINE = "\n"
-
-        
-    def __init__(self, atom, dbConfigFile, raiseException = False, \
+    ILLEGAL_UNICODE_MESSAGE = 'Illegal unicode found in string'
+
+        
+    def __init__(self, atom, dbConfigFile, raiseException = True, \
                  newLineChar= NEW_LINE, loadAllCollections = False, \
                  isDebug = False):
@@ -174 +175 @@
                 spatialError += "Incomplete spatial coverage data.%s"  %self._nl
             if incorrectFormat:
-                spatialError += "Spatial coverage data not in numerical format."
-
+                spatialError += "Spatial coverage data not in numerical format.%s"  %self._nl
+
+            if not self.__isRangeValid(self._atom.minX ,self._atom.maxX):
+                spatialError += "Max longitude is less than min longitude.%s"  %self._nl
+                
+            if not self.__isRangeValid(self._atom.minY ,self._atom.maxY):
+                spatialError += "Max latitude is less than min latitude.%s"  %self._nl
+                
+                
             if spatialError:
                 self.__addError('spatialcoverage', spatialError)
@@ -207 +215 @@
 
 
+    def __isRangeValid(self, minVal, maxVal):
+        '''
+        Check if two values adhere to being min/max of a range
+        @param minVal: start of the range
+        @param maxVal: end of the range
+        @return: True, if range is valid, or unknown (inputs may be badly defined), or False otherwise
+        '''
+        try:
+            if float(minVal) <= float(maxVal):
+                return True
+            else:
+                return False
+        except:
+            logging.debug("Comparing invalid data: '%s' vs '%s'" %(minVal, maxVal))
+        
+        return False
+
     def __validateUnicode(self):
         '''
@@ -219 +244 @@
                         if not self.errors.has_key(key):
                             self.errors[key] = ''
-                        self.errors[key] += "Illegal unicode found in string: '%s'.'%s'" %(val, nl)
+                        self.errors[key] += "%s: '%s'.'%s'" %(self.ILLEGAL_UNICODE_MESSAGE, \
+                                                              val, self._nl)
         logging.info("Completed validating unicode UTF-8 compliance")