Use findUnknownCourses method, DRY

saltybeagle · May 7, 2012 · 335cddb · 335cddb
1 parent 8c6da51
commit 335cddb
Showing 1 changed file with 6 additions and 27 deletions.
diff --git a/scripts/find_course_data_errors.php b/scripts/find_course_data_errors.php
@@ -15,43 +15,22 @@
     foreach ($subject_area->courses as $course) {
         /* @var $course UNL_Services_CourseApproval_Course */
         // Find courses within prereqs
-        foreach (UNL_UndergraduateBulletin_EPUB_Utilities::findCourses($course->prerequisite) as $prereq_subject_code => $prereq_courses) {
-            try {
-                $prereq_subject = new UNL_Services_CourseApproval_SubjectArea($prereq_subject_code);
-                foreach ($prereq_courses as $prereq_course) {
-                    // try and get the listing
-                    $prereq_subject->courses[$prereq_course];
-                }
-            } catch (Exception $e) {
+        foreach (UNL_UndergraduateBulletin_EPUB_Utilities::findUnknownCourses($course->prerequisite) as $prereq_subject_code => $prereq_courses) {
+            foreach ($prereq_courses as $prereq_course) {
                 $missing_courses["$prereq_subject_code $prereq_course"][] = "Found in $subject_area {$course->getHomeListing()->courseNumber} prereqs";
             }
-            unset($prereq_subject);
         }
         // Find courses within notes
-        foreach (UNL_UndergraduateBulletin_EPUB_Utilities::findCourses($course->notes) as $notes_subject_code => $notes_courses) {
-            try {
-                $notes_subject = new UNL_Services_CourseApproval_SubjectArea($notes_subject_code);
-                foreach ($notes_courses as $notes_course) {
-                    // try and get the listing
-                    $notes_subject->courses[$notes_course];
-                }
-            } catch (Exception $e) {
+        foreach (UNL_UndergraduateBulletin_EPUB_Utilities::findUnknownCourses($course->notes) as $notes_subject_code => $notes_courses) {
+            foreach ($notes_courses as $notes_course) {
                 $missing_courses["$notes_subject_code $notes_course"][] = "Found in $subject_area {$course->getHomeListing()->courseNumber} notes";
             }
-            unset($notes_subject);
         }
         // Find courses within description
-        foreach (UNL_UndergraduateBulletin_EPUB_Utilities::findCourses($course->description) as $desc_subject_code => $desc_courses) {
-            try {
-                $desc_subject = new UNL_Services_CourseApproval_SubjectArea($desc_subject_code);
-                foreach ($desc_courses as $desc_course) {
-                    // try and get the listing
-                    $desc_subject->courses[$desc_course];
-                }
-            } catch (Exception $e) {
+        foreach (UNL_UndergraduateBulletin_EPUB_Utilities::findUnknownCourses($course->description) as $desc_subject_code => $desc_courses) {
+            foreach ($desc_courses as $desc_course) {
                 $missing_courses["$desc_subject_code $desc_course"][] = "Found in $subject_area {$course->getHomeListing()->courseNumber} description";
             }
-            unset($desc_subject);
         }
     }
 }