X-Git-Url: http://git.maemo.org/git/?p=gigfinder;a=blobdiff_plain;f=src%2Fopt%2Fgigfinder%2Fresultsparser.py;h=9f50ae8358158bed107b295ca8d1bab9cc5982e6;hp=793cb4c306d9927a121cc58f662d3ace06992426;hb=19cbc70c06bdedf3561851edda11a42ae282b79a;hpb=b7e3bc16f6bb5ba1341bf1c7b61d8dd085c798dd

diff --git a/src/opt/gigfinder/resultsparser.py b/src/opt/gigfinder/resultsparser.py
index 793cb4c..9f50ae8 100644
--- a/src/opt/gigfinder/resultsparser.py
+++ b/src/opt/gigfinder/resultsparser.py
@@ -1,12 +1,40 @@
 from xml.dom.minidom import parseString
 from datetime import datetime, date
 import time
+import simplejson
 
 import location
 
+from events import Event
+
 def parse_json(json, lat, lng):
     """ Parse json into usable format """
-    pass
+    events_list = []
+    today = date.today()
+    
+    events = json['events']['event']
+    for event in events:
+        venue_location = event['venue']['location']
+        address = '\n'.join([venue_location['street'],
+                             venue_location['city'],
+                             venue_location['country'],
+                             venue_location['postalcode']])
+        venue_geo = venue_location['geo:point']
+        if type(event['artists']['artist']) == list:
+            artist = '\n'.join(event['artists']['artist'])
+        else:
+            artist = event['artists']['artist']
+                
+        event_obj = Event(event['title'], 
+                          event['venue']['name'], 
+                          address, 
+                          venue_geo['geo:long'],
+                          venue_geo['geo:lat'],
+                          artist, 
+                          parse_date(event['startDate']))
+        event_list.append(event_obj)
+    return event_list
+        
 
 def parse_xml(xml, lat, lng):
     """ Parse xml into a dict """