Merge

hackathon_starter/hackathon/scripts/quandl.py

@@ -4,14 +4,13 @@ aggregating data from markets throughout the world'''
 import requests
 import simplejson as json
 
-
 def dowjonesIndustrialAvg(apikey):
     '''Returns JSON data of the Dow Jones Average.'''
     parameters = {'rows' : 1, 'auth_token' : apikey}
     apiurl = 'https://www.quandl.com/api/v1/datasets/BCB/UDJIAD1.json?'
     reap = requests.get(apiurl, params=parameters)
     desu = json.loads(reap.content)
-    return desu['data']
+    return desu
 
 def snp500IndexPull(apikey):
     '''Returns JSON data of the S&P 500 Index.'''
@@ -19,7 +18,7 @@ def snp500IndexPull(apikey):
     apiurl = 'https://www.quandl.com/api/v1/datasets/YAHOO/INDEX_GSPC.json?'
     reap = requests.get(apiurl, params=parameters)
     desu = json.loads(reap.content)
-    return desu['data']
+    return desu
 
 def nasdaqPull(apikey):
     '''Returns JSON data of the Nasdaq Index.'''
@@ -27,5 +26,4 @@ def nasdaqPull(apikey):
     apiurl = 'https://www.quandl.com/api/v1/datasets/GOOG/NASDAQ_SWTX.json?'
     reap = requests.get(apiurl, params=parameters)
     desu = json.loads(reap.content)
-    return desu['data']
-    
+    return desu

hackathon_starter/hackathon/urls.py

@@ -26,5 +26,5 @@ urlpatterns = patterns('',
     url(r'^quandlSnp500/$', views.quandlSnp500, name='quandlsnp500'),
     url(r'^quandlNasdaq/$', views.quandlNasdaq, name='quandlnasdaq'),
     url(r'^quandlDowJones/$', views.quandlDowJones, name='quandldowjones'),
-    url(r'^quandl/$', views.quandl, name='quandl'),
-)
+    url(r'^quandlstocks/$', views.quandlstocks, name='quandlstocks'),
+)