Merge branch 'master' into flaskBranch

Author: Khaled

flask/databaseOperations.py

@@ -63,7 +63,7 @@ def printall():
 
 def injectData(data):
 	# Assume first row of data is header
-	print("This should be the header: "+data.pop(0)) # remove header
+	print("This should be the header: ", data.pop(0)) # remove header
 	for row in data:
 		addpost(row)
 	return "All data inserted"
@@ -142,6 +142,4 @@ def unSubAll(userID):
 		topicList+=","
 	# print(topicList)
 	unSub(userID,topicList)
-	return "user unsubscribed from all"	
-
-
+	return "user unsubscribed from all"

flask/flaskapp.py

@@ -84,7 +84,7 @@ def postJson():
 	new_data.close()
 
 	# Put data into DB
-	db.injectData(sorted(ReadCSV(filename),key= lambda x: x["updated_at"],reverse=True))
+	db.injectData(sorted(ReadCSV(filename),key= lambda x: x[17],reverse=True)) #where updated_at is
 	return Response("We received something")
 
 @app.route("/addUserSubscriptionAll", methods=['POST'])