From d070cb616b3954b30c2d23f7f1c97795bef55752 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Tue, 27 Dec 2011 00:06:58 +0530
Subject: [PATCH] pad ids to len 7 for storage

---
 pandora/clip/views.py      | 4 ++--
 pandora/item/models.py     | 1 +
 pandora/itemlist/models.py | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pandora/clip/views.py b/pandora/clip/views.py
index f6c2f04c..53e768a5 100644
--- a/pandora/clip/views.py
+++ b/pandora/clip/views.py
@@ -111,7 +111,7 @@ def findClips(request):
                     Annotation.objects.filter(layer=layer, clip__in=ids))
     elif 'position' in query:
         qs = order_query(qs, query['sort'])
-        ids = [i.public_id for i in qs]
+        ids = [i['public_id'] for i in qs.values('public_id')]
         data['conditions'] = data['conditions'] + {
             'value': data['position'],
             'key': query['sort'][0]['key'],
@@ -123,7 +123,7 @@ def findClips(request):
             response['data']['position'] = utils.get_positions(ids, [qs[0].itemId])[0]
     elif 'positions' in data:
         qs = order_query(qs, query['sort'])
-        ids = [i.public_id for i in qs]
+        ids = [i['public_id'] for i in qs.values('public_id')]
         response['data']['positions'] = utils.get_positions(ids, data['positions'])
     else:
         response['data']['items'] = qs.count()
diff --git a/pandora/item/models.py b/pandora/item/models.py
index 22f6d25f..f70fbd2d 100644
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@@ -772,6 +772,7 @@ class Item(models.Model):
 
     def path(self, name=''):
         h = self.itemId
+        h = (7-len(h))*'0' + h
         return os.path.join('items', h[:2], h[2:4], h[4:6], h[6:], name)
 
     '''
diff --git a/pandora/itemlist/models.py b/pandora/itemlist/models.py
index 4764a45c..837efce0 100644
--- a/pandora/itemlist/models.py
+++ b/pandora/itemlist/models.py
@@ -122,7 +122,7 @@ class List(models.Model):
         return response
 
     def path(self, name=''):
-        h = "%06d" % self.id
+        h = "%07d" % self.id
         return os.path.join('lists', h[:2], h[2:4], h[4:6], h[6:], name)
 
     def update_icon(self):