--- a/scripts/merge-features.py	Tue Jul 05 13:56:13 2016 -0400
+++ b/scripts/merge-features.py	Wed Jul 06 10:18:35 2016 -0400
@@ -26,8 +26,8 @@
 startTime = datetime.strptime(args.startTime, utils.datetimeFormat)
 endTime = datetime.strptime(args.endTime, utils.datetimeFormat)
 processInterval = moving.TimeInterval(startTime, endTime)
-cameraViews = session.query(CameraView).filter(CameraView.site == site)
-videoSequences = session.query(VideoSequence).order_by(VideoSequence.startTime.asc()).all() #.order_by(VideoSequence.cameraViewIdx) .filter(VideoSequence.startTime <= startTime)
+cameraViews = session.query(CameraView).filter(CameraView.site == site).filter(CameraView.virtual == False)
+videoSequences = session.query(VideoSequence).filter(VideoSequence.virtual == False).order_by(VideoSequence.startTime.asc()).all() #.order_by(VideoSequence.cameraViewIdx) .filter(VideoSequence.startTime <= startTime)
 videoSequences = [vs for vs in videoSequences if vs.cameraView in cameraViews]
 #timeIntervals = [v.intersection(startTime, endTime) for v in videoSequences]
 #cameraViews = set([v.cameraView for v in videoSequences])
@@ -70,9 +70,8 @@
 newTrajectoryId = -1
 # first frame num is commonTimeInterval
 for cv, vs in videoSequences.iteritems():
-    #return cursor.fetchone()[0] == 1
+    print cv.idx, cv.description
     for videoSequence in vs:
-        print videoSequence.name
         try:
             vsConnection = sqlite3.connect(dirname+os.path.sep+videoSequence.getDatabaseFilename())
             vsCursor = vsConnection.cursor()
@@ -92,7 +91,6 @@
                     featureIdCorrespondences[currentTrajectoryId] = newTrajectoryId
                 outCursor.execute(storage.insertTrajectoryQuery('positions'), (newTrajectoryId, row[1]-firstFrameNum, row[2], row[3]))
             # velocities table
-            vsCursor.execute('SELECT * FROM velocities WHERE frame_number BETWEEN {} AND {} ORDER BY trajectory_id'.format(firstFrameNum, lastFrameNum))
             for row in vsCursor:
                 outCursor.execute(storage.insertTrajectoryQuery('velocities'), (featureIdCorrespondences[row[0]], row[1]-firstFrameNum, row[2], row[3]))
             # saving the id correspondences
@@ -101,9 +99,9 @@
             outConnection.commit()
         except sqlite3.OperationalError as error:
             storage.printDBError(error)
-
-# TODO save the information of the new "sequence" in the metadata
-mergedCameraView = CameraView('merged', None, site, cv.cameraType, None, None)
+            
+# save the information of the new virtual sequence and camera view in the metadata
+mergedCameraView = CameraView('merged', None, site, cv.cameraType, None, None, virtual = True)
+session.add(mergedCameraView)
+session.add(VideoSequence('merged', commonTimeInterval.first, commonTimeInterval.last-commonTimeInterval.first, mergedCameraView, virtual = True))
 session.commit()
-session.add(VideoSequence('merged', commonTimeInterval.first, commonTimeInterval.last-commonTimeInterval.first, mergedCameraView))
-session.commit()