Skip to content

Data dump fix #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2017
Merged

Data dump fix #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
205e7bd
Fixes major parse errors
devinmatte Oct 31, 2017
487f849
Merge pull request #136 from devinmatte/develop
bgrawi Oct 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions tools/processDump.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ function fileToTempTable($tableName, $file, $fields, $fileSize, $procFunc=NULL)
`strm` int(4) UNSIGNED NOT NULL,
`session_code` varchar(4) NOT NULL,
`class_section` varchar(4) NOT NULL,
`subject` int(4) UNSIGNED ZEROFILL NOT NULL,
`subject` VARCHAR (4) NOT NULL,
`catalog_nbr` VARCHAR(4) NOT NULL,
`descr` text NOT NULL,
`topic` text NOT NULL,
Expand Down Expand Up @@ -457,9 +457,13 @@ function procInstrArray($lineSplit) {
preg_match("/(\d)(\d{3})/", $row['strm'], $match);
$row['strm'] = $match[1] . 0 . $match[2];

// Create a default break value
$break = '0000-00-00';

// Insert the quarter
$query = "INSERT INTO quarters (quarter, start, end)";
$query .= " VALUES({$row['strm']}, '{$row['start_dt']}', '{$row['end_dt']}')";
// TODO: Change schema from quarters to semesters (I doubt they're switching back anytime soon)
$query = "INSERT INTO quarters (quarter, start, end, breakstart, breakend)";
$query .= " VALUES({$row['strm']}, '{$row['start_dt']}', '{$row['end_dt']}', $break, $break)";
$query .= " ON DUPLICATE KEY UPDATE";
$query .= " start='{$row['start_dt']}', end='{$row['end_dt']}'";

Expand Down Expand Up @@ -557,8 +561,8 @@ function procInstrArray($lineSplit) {
$row['course_descrlong'] = mysqli_real_escape_string($dbConn, $row['course_descrlong']);

// Insert or update the course
$courseId = insertOrUpdateCourse($row['qtr'], $row['subject'], $row['acad_org'], $row['catalog_nbr'],
$row['units'], $row['descr'], $row['course_descrlong']);
$courseId = insertOrUpdateCourse($row['qtr'], 0000, $row['acad_org'], $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");
echo(" ");
Expand Down Expand Up @@ -702,6 +706,7 @@ function procInstrArray($lineSplit) {
$days = array($time['sun'], $time['mon'], $time['tues'], $time['wed'], $time['thurs'], $time['fri'], $time['sat']);
foreach($days as $i => $dayTruth) {
if($dayTruth == 'Y') {
// TODO: Fix schema to allow `room` to be larger than varchar(4)
$timeInsert = "INSERT INTO times (section, day, start, end, building, room)";
$timeInsert .= " VALUES({$sectId}, {$i}, {$startTime}, {$endTime}, ";
$timeInsert .= "'{$time['bldg']}', '{$time['room_nbr']}')";
Expand Down