From 86305e4c76f73828f2c4b1a09037e8ed9aef22c8 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sat, 6 Nov 2010 17:14:00 +0100
Subject: [PATCH] more generic search table

---
 pandora/backend/managers.py                   |  49 +--
 ...el_field_itemfind_trivia__del_field_ite.py | 375 ++++++++++++++++++
 pandora/backend/migrations/0013_auto.py       | 225 +++++++++++
 pandora/backend/models.py                     |  81 ++--
 4 files changed, 640 insertions(+), 90 deletions(-)
 create mode 100644 pandora/backend/migrations/0012_auto__del_field_itemfind_all__del_field_itemfind_trivia__del_field_ite.py
 create mode 100644 pandora/backend/migrations/0013_auto.py

diff --git a/pandora/backend/managers.py b/pandora/backend/managers.py
index 9ca5afb9..59d1b230 100644
--- a/pandora/backend/managers.py
+++ b/pandora/backend/managers.py
@@ -34,7 +34,6 @@ def parseCondition(condition):
     }
     ...
 	'''
-
     k = condition.get('key', 'all')
     k = {'id': 'itemId'}.get(k, k)
     if not k: k = 'all'
@@ -48,29 +47,36 @@ def parseCondition(condition):
         exclude = False
     if keyType(k) == "string":
         in_find=True
+        value_key = 'find__value'
         if op == '=':
             if k in models.Item.facet_keys:
                 in_find=False
                 v = models.Item.objects.filter(facets__key=k, facets__value=v)
                 k = 'id__in'
             else:
-                k = '%s__iexact' % k
+                value_key = 'find__value__iexact'
         elif op == '^':
             v = v[1:]
-            k = '%s__istartswith' % k
+            value_key = 'find__value__istartswith'
         elif op == '$':
             v = v[:-1]
-            k = '%s__iendswith' % k
+            value_key = 'find__value__iendswith'
         else: # elif op == '~':
-            k = '%s__icontains' % k
-        if in_find and not k.startswith('itemId'):
-            k = 'find__%s' % k
+            value_key = 'find__value__icontains'
         k = str(k)
         if exclude:
-            return ~Q(**{k:v})
+            if in_find and not k.startswith('itemId'):
+                q = ~Q(**{'find__key':k, value_key:v})
+            else:
+                q = ~Q(**{k:v})
         else:
-            return Q(**{k:v})
+            if in_find and not k.startswith('itemId'):
+                q = Q(**{'find__key':k, value_key:v})
+            else:
+                q = Q(**{k:v})
+        return q
     else: #number or date
+        #FIXME: this part needs to be moved to use key/value find db 
         def parseDate(d):
             while len(d) < 3:
                 d.append(1)
@@ -208,28 +214,3 @@ class ItemManager(Manager):
         qs = self.filter_list(qs, l, user)
         return qs
 
-class FileManager(Manager):
-    def get_query_set(self):
-        return super(FileManager, self).get_query_set()
-
-    def item_files(self, item):
-        q = self.get_query_set()
-        return q.filter(type=1, item=item)
-
-class ArchiveFileManager(Manager):
-    def get_query_set(self):
-        return super(ArchiveFileManager, self).get_query_set()
-
-    def item_files(self, item):
-        q = self.get_query_set()
-        return q.filter(file__is_video=True, file__item=item)
-
-    def by_oshash(self, oshash):
-        q = self.get_query_set()
-        q = q.filter(file__oshash=oshash)
-        if q.count() == 0:
-            raise models.ArchiveFile.DoesNotExist("%s matching oshash %s does not exist." %
-                 (models.ArchiveFile._meta.object_name, oshash))
-        else:
-            return q[0]
-
diff --git a/pandora/backend/migrations/0012_auto__del_field_itemfind_all__del_field_itemfind_trivia__del_field_ite.py b/pandora/backend/migrations/0012_auto__del_field_itemfind_all__del_field_itemfind_trivia__del_field_ite.py
new file mode 100644
index 00000000..4672295e
--- /dev/null
+++ b/pandora/backend/migrations/0012_auto__del_field_itemfind_all__del_field_itemfind_trivia__del_field_ite.py
@@ -0,0 +1,375 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Deleting field 'ItemFind.all'
+        db.delete_column('backend_itemfind', 'all')
+
+        # Deleting field 'ItemFind.trivia'
+        db.delete_column('backend_itemfind', 'trivia')
+
+        # Deleting field 'ItemFind.language'
+        db.delete_column('backend_itemfind', 'language')
+
+        # Deleting field 'ItemFind.keyword'
+        db.delete_column('backend_itemfind', 'keyword')
+
+        # Deleting field 'ItemFind.title'
+        db.delete_column('backend_itemfind', 'title')
+
+        # Deleting field 'ItemFind.country'
+        db.delete_column('backend_itemfind', 'country')
+
+        # Deleting field 'ItemFind.producer'
+        db.delete_column('backend_itemfind', 'producer')
+
+        # Deleting field 'ItemFind.writer'
+        db.delete_column('backend_itemfind', 'writer')
+
+        # Deleting field 'ItemFind.character'
+        db.delete_column('backend_itemfind', 'character')
+
+        # Deleting field 'ItemFind.actor'
+        db.delete_column('backend_itemfind', 'actor')
+
+        # Deleting field 'ItemFind.filename'
+        db.delete_column('backend_itemfind', 'filename')
+
+        # Deleting field 'ItemFind.director'
+        db.delete_column('backend_itemfind', 'director')
+
+        # Deleting field 'ItemFind.cinematographer'
+        db.delete_column('backend_itemfind', 'cinematographer')
+
+        # Deleting field 'ItemFind.editor'
+        db.delete_column('backend_itemfind', 'editor')
+
+        # Deleting field 'ItemFind.dialog'
+        db.delete_column('backend_itemfind', 'dialog')
+
+        # Deleting field 'ItemFind.year'
+        db.delete_column('backend_itemfind', 'year')
+
+        # Deleting field 'ItemFind.genre'
+        db.delete_column('backend_itemfind', 'genre')
+
+        # Deleting field 'ItemFind.summary'
+        db.delete_column('backend_itemfind', 'summary')
+
+        # Deleting field 'ItemFind.location'
+        db.delete_column('backend_itemfind', 'location')
+
+        # Adding field 'ItemFind.id'
+        db.add_column('backend_itemfind', 'id', self.gf('django.db.models.fields.AutoField')(default=None, primary_key=True), keep_default=False)
+
+        # Adding field 'ItemFind.key'
+        db.add_column('backend_itemfind', 'key', self.gf('django.db.models.fields.CharField')(default=None, max_length=200), keep_default=False)
+
+        # Adding field 'ItemFind.value'
+        db.add_column('backend_itemfind', 'value', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Changing field 'ItemFind.item'
+        db.alter_column('backend_itemfind', 'item_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['backend.Item']))
+
+        # Removing unique constraint on 'ItemFind', fields ['item']
+        db.delete_unique('backend_itemfind', ['item_id'])
+
+        # Adding unique constraint on 'ItemFind', fields ['item', 'key']
+        db.create_unique('backend_itemfind', ['item_id', 'key'])
+
+        # Adding unique constraint on 'PosterUrl', fields ['url', 'item', 'service']
+        db.create_unique('backend_posterurl', ['url', 'item_id', 'service'])
+
+
+    def backwards(self, orm):
+        
+        # Adding field 'ItemFind.all'
+        db.add_column('backend_itemfind', 'all', self.gf('django.db.models.fields.TextField')(default=None, blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.trivia'
+        db.add_column('backend_itemfind', 'trivia', self.gf('django.db.models.fields.TextField')(default=None, blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.language'
+        db.add_column('backend_itemfind', 'language', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.keyword'
+        db.add_column('backend_itemfind', 'keyword', self.gf('django.db.models.fields.TextField')(default=None, blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.title'
+        db.add_column('backend_itemfind', 'title', self.gf('django.db.models.fields.TextField')(default=None, blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.country'
+        db.add_column('backend_itemfind', 'country', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.producer'
+        db.add_column('backend_itemfind', 'producer', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.writer'
+        db.add_column('backend_itemfind', 'writer', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.character'
+        db.add_column('backend_itemfind', 'character', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.actor'
+        db.add_column('backend_itemfind', 'actor', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.filename'
+        db.add_column('backend_itemfind', 'filename', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.director'
+        db.add_column('backend_itemfind', 'director', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.cinematographer'
+        db.add_column('backend_itemfind', 'cinematographer', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.editor'
+        db.add_column('backend_itemfind', 'editor', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.dialog'
+        db.add_column('backend_itemfind', 'dialog', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.year'
+        db.add_column('backend_itemfind', 'year', self.gf('django.db.models.fields.CharField')(default=None, max_length=4), keep_default=False)
+
+        # Adding field 'ItemFind.genre'
+        db.add_column('backend_itemfind', 'genre', self.gf('django.db.models.fields.TextField')(default=None, blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.summary'
+        db.add_column('backend_itemfind', 'summary', self.gf('django.db.models.fields.TextField')(default=None, blank=True), keep_default=False)
+
+        # Adding field 'ItemFind.location'
+        db.add_column('backend_itemfind', 'location', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False)
+
+        # Deleting field 'ItemFind.id'
+        db.delete_column('backend_itemfind', 'id')
+
+        # Deleting field 'ItemFind.key'
+        db.delete_column('backend_itemfind', 'key')
+
+        # Deleting field 'ItemFind.value'
+        db.delete_column('backend_itemfind', 'value')
+
+        # Changing field 'ItemFind.item'
+        db.alter_column('backend_itemfind', 'item_id', self.gf('django.db.models.fields.related.OneToOneField')(unique=True, primary_key=True, to=orm['backend.Item']))
+
+        # Adding unique constraint on 'ItemFind', fields ['item']
+        db.create_unique('backend_itemfind', ['item_id'])
+
+        # Removing unique constraint on 'ItemFind', fields ['item', 'key']
+        db.delete_unique('backend_itemfind', ['item_id', 'key'])
+
+        # Removing unique constraint on 'PosterUrl', fields ['url', 'item', 'service']
+        db.delete_unique('backend_posterurl', ['url', 'item_id', 'service'])
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'backend.collection': {
+            'Meta': {'object_name': 'Collection'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'items': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['backend.Item']"}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'subdomain': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}),
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'collections'", 'symmetrical': 'False', 'to': "orm['auth.User']"})
+        },
+        'backend.facet': {
+            'Meta': {'object_name': 'Facet'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'facets'", 'to': "orm['backend.Item']"}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'db_index': 'True'}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'value_sort': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'backend.item': {
+            'Meta': {'object_name': 'Item'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imdb': ('oxdjango.fields.DictField', [], {'default': '{}'}),
+            'itemId': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'blank': 'True'}),
+            'json': ('oxdjango.fields.DictField', [], {'default': '{}'}),
+            'metadata': ('oxdjango.fields.DictField', [], {'default': '{}'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'oxdbId': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '42', 'blank': 'True'}),
+            'poster': ('django.db.models.fields.files.ImageField', [], {'default': 'None', 'max_length': '100', 'blank': 'True'}),
+            'poster_frame': ('django.db.models.fields.FloatField', [], {'default': '-1'}),
+            'poster_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'poster_url': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'poster_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'published': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'stream_aspect': ('django.db.models.fields.FloatField', [], {'default': '1.3333333333333333'})
+        },
+        'backend.itemfind': {
+            'Meta': {'unique_together': "(('item', 'key'),)", 'object_name': 'ItemFind'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'find'", 'to': "orm['backend.Item']"}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'value': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        'backend.itemsort': {
+            'Meta': {'object_name': 'ItemSort'},
+            'aspectratio': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'bitrate': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'cast': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'cinematographer': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'cinematographer_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'connections': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'country_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'dialog': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'director': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'director_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'duration': ('django.db.models.fields.FloatField', [], {'default': '-1', 'db_index': 'True'}),
+            'editor': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'editor_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'filename': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'files': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'genre': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'item': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'sort'", 'unique': 'True', 'primary_key': 'True', 'to': "orm['backend.Item']"}),
+            'itemId': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'blank': 'True'}),
+            'keywords': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'language': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'language_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'pixels': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'producer': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'producer_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'rating': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'blank': 'True'}),
+            'resolution': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'risk': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'runtime': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'scenes': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'size': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'summary': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'db_index': 'True'}),
+            'title_desc': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'db_index': 'True'}),
+            'trivia': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'votes': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'words': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'wpm': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'writer': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'writer_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'year': ('django.db.models.fields.CharField', [], {'max_length': '4', 'db_index': 'True'}),
+            'year_desc': ('django.db.models.fields.CharField', [], {'max_length': '4', 'db_index': 'True'})
+        },
+        'backend.layer': {
+            'Meta': {'object_name': 'Layer'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['backend.Item']"}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'start': ('django.db.models.fields.FloatField', [], {'default': '-1'}),
+            'stop': ('django.db.models.fields.FloatField', [], {'default': '-1'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'backend.list': {
+            'Meta': {'object_name': 'List'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'items': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'lists'", 'symmetrical': 'False', 'through': "orm['backend.ListItem']", 'to': "orm['backend.Item']"}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'public': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'backend.listitem': {
+            'Meta': {'object_name': 'ListItem'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['backend.Item']"}),
+            'list': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['backend.List']"}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'backend.location': {
+            'Meta': {'object_name': 'Location'},
+            'area': ('django.db.models.fields.FloatField', [], {'default': '-1'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'items': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'locations_all'", 'symmetrical': 'False', 'to': "orm['backend.Item']"}),
+            'lat_center': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lat_ne': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lat_sw': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lng_center': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lng_ne': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lng_sw': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'manual': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        'backend.person': {
+            'Meta': {'object_name': 'Person'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imdbId': ('django.db.models.fields.CharField', [], {'max_length': '7', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'name_sort': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'backend.posterurl': {
+            'Meta': {'unique_together': "(('item', 'service', 'url'),)", 'object_name': 'PosterUrl'},
+            'height': ('django.db.models.fields.IntegerField', [], {'default': '128'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'poster_urls'", 'to': "orm['backend.Item']"}),
+            'service': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'width': ('django.db.models.fields.IntegerField', [], {'default': '80'})
+        },
+        'backend.reviewwhitelist': {
+            'Meta': {'object_name': 'ReviewWhitelist'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+        },
+        'backend.stream': {
+            'Meta': {'unique_together': "(('item', 'profile'),)", 'object_name': 'Stream'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'info': ('oxdjango.fields.DictField', [], {'default': '{}'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'streams'", 'to': "orm['backend.Item']"}),
+            'profile': ('django.db.models.fields.CharField', [], {'default': "'96p.webm'", 'max_length': '255'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'derivatives'", 'null': 'True', 'to': "orm['backend.Stream']"}),
+            'video': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '100', 'blank': 'True'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['backend']
diff --git a/pandora/backend/migrations/0013_auto.py b/pandora/backend/migrations/0013_auto.py
new file mode 100644
index 00000000..947ab56a
--- /dev/null
+++ b/pandora/backend/migrations/0013_auto.py
@@ -0,0 +1,225 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding index on 'ItemFind', fields ['key']
+        db.create_index('backend_itemfind', ['key'])
+
+
+    def backwards(self, orm):
+        
+        # Removing index on 'ItemFind', fields ['key']
+        db.delete_index('backend_itemfind', ['key'])
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'backend.collection': {
+            'Meta': {'object_name': 'Collection'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'items': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['backend.Item']"}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'subdomain': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048'}),
+            'users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'collections'", 'symmetrical': 'False', 'to': "orm['auth.User']"})
+        },
+        'backend.facet': {
+            'Meta': {'object_name': 'Facet'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'facets'", 'to': "orm['backend.Item']"}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'db_index': 'True'}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'value_sort': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'backend.item': {
+            'Meta': {'object_name': 'Item'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imdb': ('oxdjango.fields.DictField', [], {'default': '{}'}),
+            'itemId': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'blank': 'True'}),
+            'json': ('oxdjango.fields.DictField', [], {'default': '{}'}),
+            'metadata': ('oxdjango.fields.DictField', [], {'default': '{}'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'oxdbId': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '42', 'blank': 'True'}),
+            'poster': ('django.db.models.fields.files.ImageField', [], {'default': 'None', 'max_length': '100', 'blank': 'True'}),
+            'poster_frame': ('django.db.models.fields.FloatField', [], {'default': '-1'}),
+            'poster_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'poster_url': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'poster_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'published': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'stream_aspect': ('django.db.models.fields.FloatField', [], {'default': '1.3333333333333333'})
+        },
+        'backend.itemfind': {
+            'Meta': {'unique_together': "(('item', 'key'),)", 'object_name': 'ItemFind'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'find'", 'to': "orm['backend.Item']"}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'db_index': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        'backend.itemsort': {
+            'Meta': {'object_name': 'ItemSort'},
+            'aspectratio': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'bitrate': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'cast': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'cinematographer': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'cinematographer_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'connections': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'country': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'country_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'dialog': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'director': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'director_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'duration': ('django.db.models.fields.FloatField', [], {'default': '-1', 'db_index': 'True'}),
+            'editor': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'editor_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'filename': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'files': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'genre': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'item': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'sort'", 'unique': 'True', 'primary_key': 'True', 'to': "orm['backend.Item']"}),
+            'itemId': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'blank': 'True'}),
+            'keywords': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'language': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'language_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'pixels': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'producer': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'producer_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'rating': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'blank': 'True'}),
+            'resolution': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'risk': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'runtime': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'scenes': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'size': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'summary': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'db_index': 'True'}),
+            'title_desc': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'db_index': 'True'}),
+            'trivia': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'votes': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+            'words': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'wpm': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+            'writer': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'writer_desc': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}),
+            'year': ('django.db.models.fields.CharField', [], {'max_length': '4', 'db_index': 'True'}),
+            'year_desc': ('django.db.models.fields.CharField', [], {'max_length': '4', 'db_index': 'True'})
+        },
+        'backend.layer': {
+            'Meta': {'object_name': 'Layer'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['backend.Item']"}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'start': ('django.db.models.fields.FloatField', [], {'default': '-1'}),
+            'stop': ('django.db.models.fields.FloatField', [], {'default': '-1'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'backend.list': {
+            'Meta': {'object_name': 'List'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'items': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'lists'", 'symmetrical': 'False', 'through': "orm['backend.ListItem']", 'to': "orm['backend.Item']"}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'public': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'backend.listitem': {
+            'Meta': {'object_name': 'ListItem'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['backend.Item']"}),
+            'list': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['backend.List']"}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'backend.location': {
+            'Meta': {'object_name': 'Location'},
+            'area': ('django.db.models.fields.FloatField', [], {'default': '-1'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'items': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'locations_all'", 'symmetrical': 'False', 'to': "orm['backend.Item']"}),
+            'lat_center': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lat_ne': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lat_sw': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lng_center': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lng_ne': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lng_sw': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'manual': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'})
+        },
+        'backend.person': {
+            'Meta': {'object_name': 'Person'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imdbId': ('django.db.models.fields.CharField', [], {'max_length': '7', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'name_sort': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        'backend.posterurl': {
+            'Meta': {'unique_together': "(('item', 'service', 'url'),)", 'object_name': 'PosterUrl'},
+            'height': ('django.db.models.fields.IntegerField', [], {'default': '128'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'poster_urls'", 'to': "orm['backend.Item']"}),
+            'service': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'width': ('django.db.models.fields.IntegerField', [], {'default': '80'})
+        },
+        'backend.reviewwhitelist': {
+            'Meta': {'object_name': 'ReviewWhitelist'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'url': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+        },
+        'backend.stream': {
+            'Meta': {'unique_together': "(('item', 'profile'),)", 'object_name': 'Stream'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'info': ('oxdjango.fields.DictField', [], {'default': '{}'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'streams'", 'to': "orm['backend.Item']"}),
+            'profile': ('django.db.models.fields.CharField', [], {'default': "'96p.webm'", 'max_length': '255'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'derivatives'", 'null': 'True', 'to': "orm['backend.Stream']"}),
+            'video': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '100', 'blank': 'True'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['backend']
diff --git a/pandora/backend/models.py b/pandora/backend/models.py
index 8429dad5..016bbace 100644
--- a/pandora/backend/models.py
+++ b/pandora/backend/models.py
@@ -324,16 +324,20 @@ class Item(models.Model):
         Search related functions
     '''
     def updateFind(self):
-        try:
-            f = self.find
-        except ItemFind.DoesNotExist:
-            f = ItemFind(item=self)
+        def save(key, value):
+            f, created = ItemFind.objects.get_or_create(item=self, key=key)
+            if value not in ('', '||'):
+                f.value = value
+                f.save()
+            else:
+                f.delete()
 
-        f.title = '\n'.join([self.get('title'), self.get('original_title', '')])
+        save('title', '\n'.join([self.get('title'), self.get('original_title', '')]))
+        
         #FIXME: filter us/int  title
         #f.title += ' '.join([t.title for t in self.alternative_titles()])
 
-        f.year = self.get('year', '')
+        save('year', self.get('year', ''))
 
         for key in self.facet_keys:
             if key == 'actor':
@@ -342,23 +346,19 @@ class Item(models.Model):
                 values = [i[1] for i in self.get('actor', [])]
             else:
                 values = self.get(utils.plural_key(key), [])
-            setattr(f, key, '|%s|'%'|'.join(values))
-
-        f.summary = self.get('plot', '') + self.get('plot_outline', '')
-        f.trivia = ' '.join(self.get('trivia', []))
-        f.location = '|%s|'%'|'.join(self.get('filming_locations', []))
+            save(key, '|%s|'%'|'.join(values))
+        save('summary', self.get('plot', '') + self.get('plot_outline', ''))
+        save('trivia', ' '.join(self.get('trivia', [])))
+        save('location', '|%s|'%'|'.join(self.get('filming_locations', [])))
 
         #FIXME:
         #f.dialog = 'fixme'
-        f.dialog = '\n'.join([l.value for l in Layer.objects.filter(type='subtitle', item=self).order_by('start')])
+        save('dialog', '\n'.join([l.value for l in Layer.objects.filter(type='subtitle', item=self).order_by('start')]))
 
         #FIXME: collate filenames
         #f.filename = self.filename
-        f.all = ' '.join(filter(None, [f.title, f.director, f.country, str(f.year), f.language,
-                          f.writer, f.producer, f.editor, f.cinematographer,
-                          f.actor, f.character, f.genre, f.keyword, f.summary, f.trivia,
-                          f.location, f.filename]))
-        f.save()
+        all_find = ' '.join([f.value for f in ItemFind.objects.filter(item=self).exclude(key='all')])
+        save('all', all_find)
 
     def updateSort(self):
         try:
@@ -588,47 +588,16 @@ class Item(models.Model):
 
 class ItemFind(models.Model):
     """
-        used to search items, all search values are in here
+        used to find items,
+        item.updateFind populates this table
+        its used in manager.ItemManager
     """
-    item = models.OneToOneField('Item', related_name='find', primary_key=True)
+    class Meta:
+        unique_together = ("item", "key")
 
-    all = models.TextField(blank=True)
-    title = models.TextField(blank=True)
-    director = models.TextField(blank=True, default='')
-    country = models.TextField(blank=True, default='')
-    year = models.CharField(max_length=4)
-    language = models.TextField(blank=True, default='')
-    writer = models.TextField(blank=True, default='')
-    producer = models.TextField(blank=True, default='')
-    editor = models.TextField(blank=True, default='')
-    cinematographer = models.TextField(blank=True, default='')
-    actor = models.TextField(blank=True, default='')
-    character = models.TextField(blank=True, default='')
-
-    dialog = models.TextField(blank=True, default='')
-    #person
-
-    genre = models.TextField(blank=True)
-    keyword = models.TextField(blank=True)
-    summary = models.TextField(blank=True)
-    trivia = models.TextField(blank=True)
-    location = models.TextField(blank=True, default='')
-
-    #only for own files or as admin?
-    filename = models.TextField(blank=True, default='')
-
-    _private_fields = ('id', 'item')
-    #return available find fields
-    #FIXME: should return mapping name -> verbose_name
-    def fields(self):
-        fields = []
-        for f in self._meta.fields:
-            if f.name not in self._private_fields:
-                name = f.verbose_name
-                name = name[0].capitalize() + name[1:]
-                fields.append(name)
-        return tuple(fields)
-    fields = classmethod(fields)
+    item = models.ForeignKey('Item', related_name='find', db_index=True)
+    key = models.CharField(max_length=200, db_index=True)
+    value = models.TextField(blank=True)
 
 class ItemSort(models.Model):
     """