diff python/metadata.py @ 862:2d6249fe905a

correcting bug
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Mon, 07 Nov 2016 11:11:10 -0500
parents f9c9457b60c2
children 5afa1d30edd8
line wrap: on
line diff
--- a/python/metadata.py	Fri Nov 04 11:47:42 2016 -0400
+++ b/python/metadata.py	Mon Nov 07 11:11:10 2016 -0500
@@ -133,12 +133,15 @@
             self.map2 = None
 
     @staticmethod
-    def getCameraType(session, cameraTypeId):
+    def getCameraType(session, cameraTypeId, resX = None):
         'Returns the site(s) matching the index or the name'
         if str.isdigit(cameraTypeId):
             return session.query(CameraType).filter(CameraType.idx == int(cameraTypeId)).all()
         else:
-            return session.query(CameraType).filter(CameraType.name.like('%'+cameraTypeId+'%')).all()
+            if resX is not None:
+                return session.query(CameraType).filter(CameraType.name.like('%'+cameraTypeId+'%')).filter(CameraType.resX == resX).all()
+            else:
+                return session.query(CameraType).filter(CameraType.name.like('%'+cameraTypeId+'%')).all()
 
 class CameraView(Base):
     __tablename__ = 'camera_views'