quick datatype changes

Author: Miguel Yanez

graph_engine.py

@@ -1,13 +1,14 @@
 import time
+import scraper_utils
 
 from scraper_utils import *
 
 import gviz_api
 
 def graph_prices(origin, dest, dept_date, return_date):
 
-	description = {"query_date" : ("string", "Query Date"),
-				"min_price" : ("number", "Min Price")}
+	description = {"query_date" : ("datetime", "Query Date"),
+				"min_price" : ("number", "%s to %s" % (dept_date, return_date))}
 
 	dates = list()
 	dates.append(dept_date)

scraper_utils.py

@@ -13,6 +13,7 @@
 from dateutil.rrule import *
 from dateutil.parser import *
 
+MO, TU, WE, TH, FR, SA, SU = weekdays = tuple(range(7))
 
 def search_flights(date_pair, origin, dest):
 
@@ -46,13 +47,13 @@ def generate_date_pairs(frequency, weekdays, start_date, until_date):
 	return date_pairs
 
 #This method returns a dict of all queried prices and query_date for a specific date_pair
-def get_all_prices_for_date_pair(date_pair):
+def get_all_prices_for_date_pair(origin, dest, date_pair):
 
 	result = dict()
-	solutions = Solution.objects(depart_date=date_pair[0], return_date=date_pair[1])
+	solutions = Solution.objects(depart_date=date_pair[0], return_date=date_pair[1], origin=origin, destination=dest)
 
 	for sol in solutions:
-		query_date = sol.query_date.strftime('%m-%d-%Y')
+		query_date = sol.query_date
 		min_price = sol.min_price[3:] #get rid of USD
 
 		if (not result.has_key(query_date)):