fixed an issue with api output, tightened up urls for api

api/urls.py

@@ -3,7 +3,7 @@
 import api.views
 
 urlpatterns = patterns('',
- url(r'^get_game_data/(\d+)$', api.views.game_request),
+ url(r'^get_game_data/(\d{8})$', api.views.game_request),
  url(r'^get_game_list/$', api.views.game_list_request),
- url(r'^get_game_list/([a-zA-Z]+)$', api.views.game_list_request)
+ url(r'^get_game_list/([a-zA-Z]{3})$', api.views.game_list_request)
  )

datamanager/models.py

@@ -51,7 +51,7 @@ def revert_game_id(self):
  def get_json(self):
  header_dict = {'id' : self.game_id, 'date' : self.get_date_str(), 
  'home_team' : self.home_team.name, 'away_team' : self.away_team.name}
- return json.dumps(header_dict)
+ return header_dict
 
  def get_date_str(self):
  return self.date.strftime('%m/%d/%Y')
@@ -85,7 +85,7 @@ def get_json(cls, date=None, team_initials=None):
  for game in query:
  game_list.append(game.get_json())
 
- return json.dumps(game_list)
+ return json.dumps(game_list, indent=4)
 
  @classmethod
  def load_headers(cls, page):

games/models.py

@@ -227,7 +227,7 @@ def get_json(self):
  game_dict['date'] = self.get_date_str()
  game_dict['id'] = self.game_id
 
- return json.dumps(game_dict)
+ return json.dumps(game_dict, indent=4)
 
  def get_date_str(self):
  return self.date.strftime('%m/%d/%Y')
@@ -324,10 +324,10 @@ def __unicode__(self):
  def get_json(self):
  '''
  dumps json LineGame representation'''
- return json.dumps({'pk': self.pk, 'players': self.__unicode__(), 
+ return {'pk': self.pk, 'players': self.__unicode__(), 
  "type" : self.line.line_type, "num_shifts" : self.num_shifts, "ice_time_num": self.ice_time, 
  "ice_time_str": self.ice_time_str, "goals": self.goals,
- "shots": self.shots, "blocks": self.blocks, "hits": self.hits})
+ "shots": self.shots, "blocks": self.blocks, "hits": self.hits}