Skip to content

Commit 635ff69

Browse files
committed
Fixed missing courses from not being imported correctly.
Changed session_code column to corect datatype and then grouped by it when selecting temporary courses. This fixes #13!
1 parent 30c5403 commit 635ff69

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "schedulemaker",
3-
"version": "3.0.1",
3+
"version": "3.0.2",
44
"private": true,
55
"description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",
66
"main": "index.php",

tools/processDump.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
require_once("../inc/config.php");
1818
require_once("../inc/databaseConn.php");
1919
require_once("../inc/timeFunctions.php");
20-
require_once("../inc/httphelper.php");
2120

2221
$dbConn = mysqli_connect($DATABASE_SERVER, $DATABASE_USER, $DATABASE_PASS, $DATABASE_DB);
2322

@@ -163,7 +162,7 @@ function getTempSections($courseNum, $offerNum, $term, $sessionNum) {
163162
// Query for the sections of the course
164163
$query = "SELECT class_section,descr,topic,enrl_stat,class_stat,class_type,enrl_cap,enrl_tot,instruction_mode,schedule_print ";
165164
$query .= "FROM classes WHERE crse_id={$courseNum} AND crse_offer_nbr={$offerNum} AND strm={$term} ";
166-
$query .= "AND session_code={$sessionNum}";
165+
$query .= "AND session_code='{$sessionNum}'";
167166
$results = mysqli_query($dbConn, $query);
168167

169168
// Check for errors
@@ -299,7 +298,7 @@ function fileToTempTable($tableName, $file, $fields, $fileSize, $procFunc=NULL)
299298
`crse_id` int(6) UNSIGNED NOT NULL,
300299
`crse_offer_nbr` int(2) UNSIGNED NOT NULL,
301300
`strm` int(4) UNSIGNED NOT NULL,
302-
`session_code` int(1) UNSIGNED NOT NULL,
301+
`session_code` varchar(4) NOT NULL,
303302
`class_section` varchar(4) NOT NULL,
304303
`subject` int(4) UNSIGNED ZEROFILL NOT NULL,
305304
`catalog_nbr` VARCHAR(4) NOT NULL,
@@ -354,7 +353,7 @@ function procClassArray($lineSplit) {
354353
`crse_id` int(6) NOT NULL,
355354
`crse_offer_nbr` int(2) NOT NULL,
356355
`strm` int(4) NOT NULL,
357-
`session_code` int(1) NOT NULL,
356+
`session_code` varchar(4) NOT NULL,
358357
`class_section` varchar(4) NOT NULL,
359358
`class_mtg_nbr` int(2) NOT NULL,
360359
`start_dt` date NOT NULL,
@@ -406,7 +405,7 @@ function procMeetArray($lineSplit) {
406405
`crse_id` int(6) NOT NULL,
407406
`crse_offer_nbr` int(2) NOT NULL,
408407
`strm` int(4) NOT NULL,
409-
`session_code` int(1) NOT NULL,
408+
`session_code` varchar(4) NOT NULL,
410409
`class_section` varchar(4) NOT NULL,
411410
`class_mtg_nbr` int(2) NOT NULL,
412411
`last_name` varchar(30) NOT NULL,
@@ -526,7 +525,7 @@ function procInstrArray($lineSplit) {
526525
// Grab each COURSE from the classes table
527526
$courseQuery = "SELECT strm, subject, acad_org, catalog_nbr, descr, course_descrlong,";
528527
$courseQuery .= " crse_id, crse_offer_nbr, session_code";
529-
$courseQuery .= " FROM classes WHERE strm < 20130 GROUP BY crse_id, strm";
528+
$courseQuery .= " FROM classes WHERE strm < 20130 GROUP BY crse_id, strm, session_code";
530529
debug("... Updating courses\n0%", false);
531530
$courseResult = mysqli_query($dbConn, $courseQuery);
532531
if(!$courseResult) {
@@ -583,7 +582,7 @@ function procInstrArray($lineSplit) {
583582
// Fetch the first instructor for the section
584583
$instQuery = "SELECT CONCAT(first_name,' ',last_name) AS i FROM instructors";
585584
$instQuery .= " WHERE crse_id={$row['crse_id']} AND crse_offer_nbr={$row['crse_offer_nbr']}";
586-
$instQuery .= " AND strm={$row['strm']} AND session_code={$row['session_code']}";
585+
$instQuery .= " AND strm={$row['strm']} AND session_code='{$row['session_code']}'";
587586
$instQuery .= " AND class_section='{$sect['class_section']}' LIMIT 1";
588587
$instResult = mysqli_query($dbConn, $instQuery);
589588
if(!$instResult) {
@@ -643,7 +642,7 @@ function procInstrArray($lineSplit) {
643642
// Select all the meeting times of the section
644643
$timeQuery = "SELECT bldg, room_nbr, meeting_time_start, meeting_time_end, mon, tues, wed, thurs, fri, sat, sun";
645644
$timeQuery .= " FROM meeting WHERE crse_id={$row['crse_id']} AND crse_offer_nbr={$row['crse_offer_nbr']}";
646-
$timeQuery .= " AND strm={$row['strm']} AND session_code={$row['session_code']}";
645+
$timeQuery .= " AND strm={$row['strm']} AND session_code='{$row['session_code']}'";
647646
$timeQuery .= " AND class_section='{$sect['class_section']}'";
648647
$timeResult = mysqli_query($dbConn, $timeQuery);
649648
if(!$timeResult) {

0 commit comments

Comments
 (0)