--- a/scripts/merge-features.py	Thu Dec 07 23:31:54 2017 -0500
+++ b/scripts/merge-features.py	Wed Dec 13 14:06:20 2017 -0500
@@ -2,21 +2,23 @@
 
 import sys, argparse, os.path, sqlite3
 import cvutils, utils, moving, storage
-from metadata import createDatabase, Site, VideoSequence, CameraView
+from metadata import createDatabase, Site, VideoSequence, CameraView, getSite
 from datetime import datetime, timedelta
 
+timeConverter = utils.TimeConverter()
+
 parser = argparse.ArgumentParser(description='The program merges feature trajectories recorded from the same site synchronously between start and end time.')
 parser.add_argument('-i', dest = 'metadataFilename', help = 'name of the metadata file', required = True)
 parser.add_argument('-n', dest = 'siteId', help = 'site id or site name', required = True)
-parser.add_argument('-f', dest = 'startTime', help = 'time to start merging features (format %%Y-%%m-%%d %%H:%%M:%%S, eg 2011-06-22 10:00:39)') # if not provided, take common time interval
-parser.add_argument('-l', dest = 'endTime', help = 'time to stop merging features (format %%Y-%%m-%%d %%H:%%M:%%S, eg 2011-06-22 10:00:39)')
+parser.add_argument('-f', dest = 'startTime', help = 'time to start merging features (format %%Y-%%m-%%d %%H:%%M:%%S, eg 2011-06-22 10:00:39)', type = timeConverter.convert) # if not provided, take common time interval
+parser.add_argument('-l', dest = 'endTime', help = 'time to stop merging features (format %%Y-%%m-%%d %%H:%%M:%%S, eg 2011-06-22 10:00:39)', type = timeConverter.convert)
 parser.add_argument('-o', dest = 'outputDBFilename', help = 'name of the output SQLite file', required = True)
 
 args = parser.parse_args()
 
 session = createDatabase(args.metadataFilename)
 
-site = Site.getSite(session, args.siteId)
+site = getSite(session, args.siteId)
 if site is None:
     print('Site {} was not found in {}. Exiting'.format(args.siteId, args.metadataFilename))
     sys.exit()