Merge pull request #422 from NASA-AMMOS/minor-fixes

Minor fixes to issues found in master

Author: nttoole

ait/core/cmd.py

@@ -119,9 +119,13 @@ def encode(self, value):
         """Encodes the given value according to this AIT Argument
         Definition.
         """
+        if not self.type:
+            return bytearray()
+
         if type(value) == str and self.enum and value in self.enum:
             value = self.enum[value]
-        return self.type.encode(value) if self.type else bytearray()
+        return self.type.encode(*value) if type(value) in [tuple, list] else self.type.encode(value)
+
 
     def slice(self, offset=0):
         """Returns a Python slice object (e.g. for array indexing) indicating

ait/core/db.py

@@ -708,7 +708,7 @@ def insert(self, packet, time=None, **kwargs):
             if time \
             else (sqlite3.Binary(packet._data))
 
-        self._conn.execute(sql, (sqlite3.Binary(packet._data), time))
+        self._conn.execute(sql, values)
         self._conn.commit()
 
     def _query(self, query, **kwargs):