Mercurial Hosting > traffic-intelligence
changeset 852:45a53542e046
updated unnecessary complicated query
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Tue, 20 Sep 2016 16:59:24 -0400 |
parents | 07fb949ff98f |
children | 95e7622b11be |
files | python/storage.py |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)