Corrected evaluation of vector.nodata.

Before, error_table contained items conforming to values set in params.
Now, the logic is inverted so that error_table contains correctly these items which do not follow values in params.

Author: igokr

src/qc_tool/test/test_vector_check.py

@@ -654,24 +654,24 @@ def test(self):
                                                       " ( 7, 0, 0, NULL),"
                                                       " ( 8, 0, 10, NULL),"
                                                       " ( 9, 0, NULL, NULL),"
-                                                      " (10, 1, 1, 1);")
+                                                      " (10, 1, 0, 0);")
         status = self.status_class()
         run_check(self.params, status)
         self.assertEqual("ok", status.status)
 
     def test_fail(self):
         from qc_tool.vector.nodata import run_check
-        self.cursor.execute("INSERT INTO mytable VALUES (1, 1, 1, 10);")
+        self.cursor.execute("INSERT INTO mytable VALUES (1, 1, 0, 10);")
         status = self.status_class()
         run_check(self.params, status)
-        self.assertEqual("ok", status.status)
+        self.assertEqual("failed", status.status)
 
     def test_fail_null(self):
         from qc_tool.vector.nodata import run_check
-        self.cursor.execute("INSERT INTO mytable VALUES (1, 1, 1, NULL);")
+        self.cursor.execute("INSERT INTO mytable VALUES (1, 1, 0, NULL);")
         status = self.status_class()
         run_check(self.params, status)
-        self.assertEqual("ok", status.status)
+        self.assertEqual("failed", status.status)
 
     def test_nodata_null(self):
         self.params["nodata_value"] = None
@@ -685,18 +685,26 @@ def test_nodata_null(self):
                                                       " ( 7, 0, 0, NULL),"
                                                       " ( 8, 0, 10, NULL),"
                                                       " ( 9, 0, NULL, NULL),"
-                                                      " (10, NULL, 1, 1);")
+                                                      " (10, NULL, 0, 0);")
         status = self.status_class()
         run_check(self.params, status)
         self.assertEqual("ok", status.status)
 
     def test_nodata_null_fail(self):
         self.params["nodata_value"] = None
         from qc_tool.vector.nodata import run_check
-        self.cursor.execute("INSERT INTO mytable VALUES (1, NULL, 1, NULL);")
+        self.cursor.execute("INSERT INTO mytable VALUES (1, NULL, 0, 10);")
         status = self.status_class()
         run_check(self.params, status)
-        self.assertEqual("ok", status.status)
+        self.assertEqual("failed", status.status)
+
+    def test_nodata_null_fail_null(self):
+        self.params["dep_value"] = None
+        from qc_tool.vector.nodata import run_check
+        self.cursor.execute("INSERT INTO mytable VALUES (1, 1, NULL, 10);")
+        status = self.status_class()
+        run_check(self.params, status)
+        self.assertEqual("failed", status.status)
 
     def test_dep_null(self):
         self.params["dep_value"] = None
@@ -715,14 +723,6 @@ def test_dep_null(self):
         run_check(self.params, status)
         self.assertEqual("ok", status.status)
 
-    def test_nodata_null_fail(self):
-        self.params["dep_value"] = None
-        from qc_tool.vector.nodata import run_check
-        self.cursor.execute("INSERT INTO mytable VALUES (1, 1, NULL, 0);")
-        status = self.status_class()
-        run_check(self.params, status)
-        self.assertEqual("ok", status.status)
-
 
 class Test_non_probable(VectorCheckTestCase):
     def test(self):

src/qc_tool/vector/nodata.py

@@ -28,23 +28,23 @@ def run_check(params, status):
             else:
                 sql_params["nodata_clause"] = "{nodata_column_name} = %(nodata_value)s".format(**sql_params)
                 sql_execute_params["nodata_value"] = params["nodata_value"]
-            if dep_column_name is None:
+            if params["dep_value"] is None:
                 sql_params["dep_clause"] = "{dep_column_name} IS NULL".format(**sql_params)
             else:
-                sql_params["dep_clause"] = "{dep_column_name} = %(dep_value)s".format(**sql_params)
+                sql_params["dep_clause"] = "{dep_column_name} IS NOT NULL AND {dep_column_name} = %(dep_value)s".format(**sql_params)
                 sql_execute_params["dep_value"] = params["dep_value"]
 
             # Create table of error items.
             sql = ("CREATE TABLE {error_table} AS"
                    " SELECT {fid_name}"
                    " FROM {layer_name}"
-                   " WHERE {nodata_clause} AND {dep_clause};")
+                   " WHERE {nodata_clause} AND NOT({dep_clause});")
             sql = sql.format(**sql_params)
             cursor.execute(sql, sql_execute_params)
 
-            # Report error items.
-            items_message = get_failed_items_message(cursor, sql_params["error_table"], layer_def["pg_fid_name"])
-            if items_message is not None:
-                status.failed("Layer {:s} has column {:s} with invalid nodata code in features with {:s}: {:s}."
-                              .format(layer_def["pg_layer_name"], params["nodata_column_name"], layer_def["fid_display_name"], items_message))
-                status.add_error_table(sql_params["error_table"], layer_def["pg_layer_name"], layer_def["pg_fid_name"])
+        # Report error items.
+        items_message = get_failed_items_message(cursor, sql_params["error_table"], layer_def["pg_fid_name"])
+        if items_message is not None:
+            status.failed("Layer {:s} has column {:s} with invalid nodata code in features with {:s}: {:s}."
+                          .format(layer_def["pg_layer_name"], params["nodata_column_name"], layer_def["fid_display_name"], items_message))
+            status.add_error_table(sql_params["error_table"], layer_def["pg_layer_name"], layer_def["pg_fid_name"])