Bugs fixed - Insert into table works

Author: flawedmatrix

database.js

@@ -1,26 +1,58 @@
+var mysql = require('mysql');	
+
+function mysql_real_escape_string (str) {
+    return str.replace(/[\0\x08\x09\x1a\n\r"'\\\%]/g, function (char) {
+        switch (char) {
+            case "\0":
+                return "\\0";
+            case "\x08":
+                return "\\b";
+            case "\x09":
+                return "\\t";
+            case "\x1a":
+                return "\\z";
+            case "\n":
+                return "\\n";
+            case "\r":
+                return "\\r";
+            case "\"":
+            case "'":
+            case "\\":
+            case "%":
+                return "\\"+char; // prepends a backslash to backslash, percent,
+                                  // and double/single quotes
+        }
+    });
+}
+
 //adding data
 exports.addtodb = function(datarows) {
-	var mysql = require('mysql');	
 	var connection = mysql.createConnection({
-		  host     : '127.0.0.1',
-		  user     : 'root',
+		  host     : 'localhost',
+		  user     : 'hackathon',
 		  password : 'password',
 		  database : 'bclass',
 	});
 	//assume that the table is set up beforehand
 	connection.connect();
-	connection.query('SELECT 1 + 1 AS solution', function(err, rows, fields) {
-	  if (err) throw err;
-
-	  console.log('The solution is: ', rows[0].solution);
-	});
 	var datarow;
 	var values;
 	console.log('arr length is ', datarows.length);
 	for(var i = 0; i < datarows.length; i++) {
 		console.log('On row ', i);
 		datarow = datarows[i];
-		values = "('"+datarow.dept+"', '"+datarow.title+"', '"+datarow.courseno+"', '"+datarow.sectionno+"', '"+datarow.controlno+"', '"+datarow.time+"', '"+datarow.room+"', '"+datarow.units+"', '"+datarow.instructor+"', '"+datarow.examgroup+"', '"+datarow.restrictions+"', '"+datarow.note+"')";
+		values = "('" + mysql_real_escape_string(datarow.dept) + "', '" + 
+                    mysql_real_escape_string(datarow.title) + "', '" + 
+                    mysql_real_escape_string(datarow.courseno) + "', '" + 
+                    mysql_real_escape_string(datarow.sectionno) + "', '" + 
+                    mysql_real_escape_string(datarow.controlno) + "', '" + 
+                    mysql_real_escape_string(datarow.time) + "', '" + 
+                    mysql_real_escape_string(datarow.room) + "', '" + 
+                    mysql_real_escape_string(datarow.units) + "', '" + 
+                    mysql_real_escape_string(datarow.instructor) +"', '" + 
+                    mysql_real_escape_string(datarow.examgroup) + "', '" + 
+                    mysql_real_escape_string(datarow.restrictions) + "', '" + 
+                    mysql_real_escape_string(datarow.note) +"')";
 		connection.query('INSERT INTO courses (dept, title, courseno, sectionno, controlno, time, room, units, instructor, examgroup, restrictions, note) VALUES ' + values, function(err, rows, fields) {
 		  if (err) throw err;
 		  console.log('Inserted course no: ', datarow.controlno);
@@ -32,10 +64,9 @@ exports.addtodb = function(datarows) {
 
 //querying
 exports.querydb = function(inputrow, callback) {
-	var mysql = require('mysql');
 	var connection = mysql.createConnection({
-		  host     : 'localhost:3306',
-		  user     : 'root',
+		  host     : 'localhost',
+		  user     : 'hackathon',
 		  password : 'password',
 		  database : 'bclass',
 	});

retrieve.js

@@ -42,11 +42,10 @@ exports.retrieveData = function(term, classif, destination) {
 				//fs.writeFile("tidydata.txt", html, function(err) {});
 				var $ = cheerio.load(html);
 				var department = "";
-				var k = 0;
+				var k = -1;
 				var c = 0;
 				$("tr").each(function(i, row) {
 					var cells = $(row).find("td");
-					var n = cells.length;
 					if ((cells.length == 1) || (c > 0)) {
 						if (c == 0) {
 							c = 4;
@@ -64,7 +63,7 @@ exports.retrieveData = function(term, classif, destination) {
 							switch(j) {
 								case 0:
 									k += 1;
-									rows[k] = {dept: department};
+									rows.push({dept: department, note: ""});
 									break;
 								case 1:
 									rows[k].controlno = cell_text;
@@ -102,9 +101,6 @@ exports.retrieveData = function(term, classif, destination) {
 						});
 					}
 				});
-				for(var i = 0; i < 10; i++) {
-					console.log(rows[i].time);
-				}
 				destination(rows);
 			});
 		});