Update conflict controller to prevent courses that decend from other courses...

Update conflict controller to prevent courses that decend from other courses to be counted as conflicts.

application/controllers/ConflictController.php

@@ -13,19 +13,20 @@ class ConflictController extends Nmc_Controller_Action
     {
         $skippedRecords = Nmc_Registry_Session::getInstance('conflict')->skippedRecords;
         $sql = <<<EOF
-SELECT DISTINCT a.* , d.subject, d.course_number, d.course_letter
-FROM creq_course_crosslistings AS a,
-     creq_course_crosslistings AS b,
-     creq_course_generations AS c,
-     creq_course_generations AS c2,
-     creq_course_codes AS d
-WHERE a.course_code = b.course_code
-  AND a.course_crosslisting_id != b.course_crosslisting_id
-  AND a.generation = c.course_generation_id
-  AND c.type = 'official'
-  AND b.generation = c2.course_generation_id
-  AND c2.type = 'official'
-  AND a.course_code = d.course_code_id
+SELECT DISTINCT x1.* , c.subject, c.course_number, c.course_letter
+FROM creq_course_crosslistings AS x1,
+     creq_course_crosslistings AS x2,
+     creq_course_generations AS g1,
+     creq_course_generations AS g2,
+     creq_course_codes AS c
+WHERE x1.course_code = x2.course_code
+  AND x1.course_crosslisting_id != x2.course_crosslisting_id
+  AND x1.generation = g1.course_generation_id
+  AND g1.type = 'official'
+  AND x2.generation = g2.course_generation_id
+  AND g2.type = 'official'
+  AND x1.course_code = c.course_code_id
+  AND g1.course != g2.course
 ORDER BY subject, course_number, course_letter
 EOF;