# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1474405164 14400
# Node ID 45a53542e0469bb5b7f9e3a78d16a5343ec1c9f2
# Parent  07fb949ff98f7356601d7de27782c3925e6a8069
updated unnecessary complicated query

diff -r 07fb949ff98f -r 45a53542e046 python/storage.py
--- a/python/storage.py	Tue Sep 13 15:30:51 2016 -0400
+++ b/python/storage.py	Tue Sep 20 16:59:24 2016 -0400
@@ -137,7 +137,7 @@
     if objectNumbers is None:
         query = ''
     elif type(objectNumbers) == int:
-        query = 'between 0 and {0}'.format(objectNumbers-1)
+        query = '<= {0}'.format(objectNumbers-1)
     elif type(objectNumbers) == list:
         query = 'in ('+', '.join([str(n) for n in objectNumbers])+')'
     else:
@@ -249,10 +249,10 @@
         try:
             # attribute feature numbers to objects
             objectCriteria = getObjectCriteria(objectNumbers)
-            queryStatement = 'SELECT P.trajectory_id, OF.object_id from positions P, objects_features OF WHERE P.trajectory_id = OF.trajectory_id'
+            queryStatement = 'SELECT trajectory_id, object_id FROM objects_features'
             if objectNumbers is not None:
-                queryStatement += ' and OF.object_id '+objectCriteria
-            queryStatement += ' group by P.trajectory_id order by OF.object_id' # order is important to group all features per object
+                queryStatement += ' WHERE object_id '+objectCriteria
+            queryStatement += ' ORDER BY object_id' # order is important to group all features per object
             cursor.execute(queryStatement) 
             logging.debug(queryStatement)