diff --git a/pandora/sequence/models.py b/pandora/sequence/models.py index e8676e08a..e15a28511 100644 --- a/pandora/sequence/models.py +++ b/pandora/sequence/models.py @@ -34,7 +34,7 @@ class Sequence(models.Model): objects = managers.SequenceManager() def save(self, *args, **kwargs): - self.public_id = u"%s/%s-%s" % ( + self.public_id = u"%s/%0.03f-%0.03f" % ( self.item.itemId, float(self.start), float(self.end) ) if self.item: @@ -49,8 +49,8 @@ class Sequence(models.Model): j = { 'id': self.public_id, 'hash': self.hash, - 'in': self.start, - 'out': self.end, + 'in': float('%0.03f' % self.start), + 'out': float('%0.03f' % self.end), } if keys: for key in keys: diff --git a/pandora/sequence/tasks.py b/pandora/sequence/tasks.py index 373ea2719..0fd6614e2 100644 --- a/pandora/sequence/tasks.py +++ b/pandora/sequence/tasks.py @@ -27,8 +27,8 @@ def get_sequences(itemId): s = models.Sequence() s.item = i s.mode = mode - s.start = seq['in'] - s.end = seq['out'] + s.start = float('%0.03f' % seq['in']) + s.end = float('%0.03f' % seq['out']) s.hash = seq['hash'] s.save() diff --git a/pandora/sequence/views.py b/pandora/sequence/views.py index aa6242e95..f995a944e 100644 --- a/pandora/sequence/views.py +++ b/pandora/sequence/views.py @@ -113,11 +113,12 @@ def getSequence(request): ''' data = json.loads(request.POST['data']) response = json_response() + position = float('%0.03f' % data['position']) qs = models.Sequence.objects.filter( item__itemId=data['id'], mode=data['mode'], - start__lte=data['position'], - end__gt=data['position'] + start__lte=position, + end__gt=position ).order_by('start', 'end') for sequence in qs: response['data'] = sequence.json()