From 5916e26203ca80c995b725df3ce8cc3b7d2a4668 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Tue, 4 Jan 2011 12:20:52 +0530
Subject: [PATCH] more plural cleanup

---
 pandora/item/models.py | 8 +++++---
 pandora/item/utils.py  | 6 +++---
 pandora/item/views.py  | 1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pandora/item/models.py b/pandora/item/models.py
index fd5c9994..0acdc039 100644
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@@ -273,7 +273,9 @@ class Item(models.Model):
         if len(self.itemId) == 7:
             data = ox.web.imdb.Imdb(self.itemId)
             #FIXME: all this should be in ox.web.imdb.Imdb
-            for key in ('directors', 'writers', 'editors', 'producers', 'cinematographers', 'languages', 'genres', 'keywords'):
+            for key in ('directors', 'writers', 'editors', 'producers',
+                        'cinematographers', 'languages', 'genres', 'keywords',
+                        'episode_directors'):
                 if key in data:
                     data[key[:-1]] = data.pop(key)
             if 'countries' in data:
@@ -469,13 +471,13 @@ class Item(models.Model):
 
     def oxid(self):
         return utils.oxid(self.get('title', ''), self.get('director', []), str(self.get('year', '')),
-                          self.get('series title', ''), self.get('episode title', ''),
+                          self.get('series_title', ''), self.get('episode_title', ''),
                           self.get('season', ''), self.get('episode', ''))
 
     def oxdb_id(self):
         return utils.oxdb_id(self.get('title', ''), self.get('director', []), str(self.get('year', '')),
                           self.get('season', ''), self.get('episode', ''),
-                          self.get('episode_title', ''), self.get('episode_directors', ''), self.get('episode_year', ''))
+                          self.get('episode_title', ''), self.get('episode_director', []), self.get('episode_year', ''))
 
     '''
         Search related functions
diff --git a/pandora/item/utils.py b/pandora/item/utils.py
index 89aa2112..9812bbaa 100644
--- a/pandora/item/utils.py
+++ b/pandora/item/utils.py
@@ -39,12 +39,12 @@ def oxid(title, directors, year='', seriesTitle='', episodeTitle='', season=0, e
     return u"0x" + oxid
 
 
-def oxdb_id(title, directors=[], year='', season='', episode='', episode_title='', episode_directors=[], episode_year=''):
+def oxdb_id(title, director=[], year='', season='', episode='', episode_title='', episode_director=[], episode_year=''):
     # new id function, will replace oxid()
     def get_hash(string):
         return hashlib.sha1(string.encode('utf-8')).hexdigest().upper()
-    director = ', '.join(directors)
-    episode_director = ', '.join(episode_directors)
+    director = ', '.join(director)
+    episode_director = ', '.join(episode_director)
     if not episode:
         oxdb_id = get_hash(director)[:8] + get_hash('\n'.join([title, str(year)]))[:8]
     else:
diff --git a/pandora/item/views.py b/pandora/item/views.py
index d3211604..1cc98b24 100644
--- a/pandora/item/views.py
+++ b/pandora/item/views.py
@@ -200,6 +200,7 @@ Positions
                     r[p] = m.get(p, '')
             return r
         qs = qs[query['range'][0]:query['range'][1]]
+        #response['data']['items'] = [only_p(m.get_json()) for m in qs]
         response['data']['items'] = [only_p(m['json']) for m in qs.values('json')]
     else: # otherwise stats
         items = query['qs']