Fallback for missing Departments and 0 Errors

Author: devinmatte

schema/migrationScripts/3.0.30.sql

@@ -10,7 +10,9 @@ COMMENT 'current enrollment',
   CHANGE `instructor` `instructor` VARCHAR(64) NOT NULL DEFAULT 'TBA'
 COMMENT 'Instructor\'s Name';
 
-UPDATE `sections` SET `type`='OL' WHERE `type`='O';
+UPDATE `sections`
+SET `type` = 'OL'
+WHERE `type` = 'O';
 
 ALTER TABLE `sections`
   CHANGE `type` `type` ENUM ('R', 'N', 'H', 'BL', 'OL')
@@ -26,4 +28,11 @@ COMMENT 'room number';
 
 INSERT INTO `buildings` (`number`, `code`, `name`) VALUES ('ZAG', 'ZAG', 'Building in Croatia');
 
-ALTER TABLE `quarters` DROP `breakstart`, DROP `breakend`;
+ALTER TABLE `quarters`
+  DROP `breakstart`,
+  DROP `breakend`;
+
+ALTER TABLE `departments`
+  CHANGE `title` `title` VARCHAR(30)
+CHARACTER SET latin1
+COLLATE latin1_swedish_ci NULL;

tools/processDump.php

@@ -80,24 +80,31 @@ function halt($messages) {
  * Inserts or updates a course. This function calls the stored procedure for
  * inserting or updating a course.
  * @param $quarter      int     The term that the course is in
- * @param $departNum    int     The number of the department
- * @param $departCode   int     The code for the department
+ * @param $departCode   String  The code of the department
+ * @param $classCode    String  The code for the class
  * @param $course       int     The number of the course
  * @param $credits      int     The credits the course offers
  * @param $title        String  The title of the course
  * @param $description  String  The description for the course
  * @return  mixed   String of error message returned on failure.
  *                  Integer of course ID returned on success
  */
-function insertOrUpdateCourse($quarter, $departNum, $departCode, $course, $credits, $title, $description) {
+function insertOrUpdateCourse($quarter, $departCode, $classCode, $course, $credits, $title, $description) {
 	global $dbConn, $coursesUpdated, $coursesAdded;
 	// Call the stored proc
-	$query = "CALL InsertOrUpdateCourse({$quarter}, {$departNum}, '{$departCode}', '{$course}', {$credits}, '{$title}', '{$description}')";
+    // TODO: Refactor out department ID number (0000)
+	$query = "CALL InsertOrUpdateCourse({$quarter}, 0000, '{$classCode}', '{$course}', {$credits}, '{$title}', '{$description}')";
 	$success = mysqli_multi_query($dbConn, $query);
 
 	// Catch errors or return the id
 	if(!$success) {
-		return mysqli_error($dbConn);
+	    // If the class code errors out, try the department code
+        // TODO: Refactor out department ID number (0000)
+        $query = "CALL InsertOrUpdateCourse({$quarter}, 0000, '{$departCode}', '{$course}', {$credits}, '{$title}', '{$description}')";
+        $success = mysqli_multi_query($dbConn, $query);
+        if(!$success) {
+            return mysqli_error($dbConn);
+        }
 	}
 
 	// First result set is updated vs inserted
@@ -558,10 +565,10 @@ function procInstrArray($lineSplit) {
 	$row['course_descrlong'] = mysqli_real_escape_string($dbConn, $row['course_descrlong']);
 
 	// Insert or update the course
-    $courseId = insertOrUpdateCourse($row['qtr'], 0000, $row['acad_org'], $row['catalog_nbr'],
+    $courseId = insertOrUpdateCourse($row['qtr'], $row['acad_org'], $row['subject'], $row['catalog_nbr'],
         $row['units'], $row['descr'], $row['course_descrlong']);
-	if(!is_numeric($courseId)) {
-		echo("    *** Error: Failed to update {$row['qtr']} {$row['subject']}{$row['acad_org']}-{$row['catalog_nbr']}\n");
+    if (!is_numeric($courseId)) {
+		echo("    *** Error: Failed to update {$row['qtr']} {$row['subject']}-{$row['catalog_nbr']}\n");
 		echo("    ");
         var_dump($courseId);
         echo("\n");