# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1339040343 14400
# Node ID ce44605f888ad27c7911fd600bae878d1df6604f
# Parent  ada6e8fbe4c6b0d60b1dc97bc3fac013fe7d50a9
minor modifications

diff -r ada6e8fbe4c6 -r ce44605f888a python/storage.py
--- a/python/storage.py	Wed Jun 06 13:24:04 2012 -0400
+++ b/python/storage.py	Wed Jun 06 23:39:03 2012 -0400
@@ -25,9 +25,9 @@
     connection = sqlite3.connect(outFile)
     cursor = connection.cursor()
 
-    #creation de la table
-    schema = "CREATE TABLE \"trajectories\"(trajectory_id INTEGER,frame_number INTEGER, x_coordinate REAL, y_coordinate REAL, PRIMARY KEY(trajectory_id, frame_number))"
+    schema = "CREATE TABLE \"positions\"(trajectory_id INTEGER,frame_number INTEGER, x_coordinate REAL, y_coordinate REAL, PRIMARY KEY(trajectory_id, frame_number))"
     cursor.execute(schema)
+
     trajectory_id = 0
     frame_number = 0
     if trajectoryType == 'feature':
@@ -37,16 +37,12 @@
                 frame_number = 0
                 for position in trajectory.getPositions():
                     frame_number += 1
-                    requete = "insert into trajectories(trajectory_id, frame_number, x_coordinate, y_coordinate) values (?,?,?,?)"
-                    cursor.execute(requete,(trajectory_id,frame_number,position.x,position.y))
+                    query = "insert into positions (trajectory_id, frame_number, x_coordinate, y_coordinate) values (?,?,?,?)"
+                    cursor.execute(query,(trajectory_id,frame_number,position.x,position.y))
                     
     connection.commit()            
     connection.close()
 
-def testWrite():
-    features = loadTrajectoriesFromSqlite("/home/francois/Unison/École/12Été/CRSNG/Data/prototypes.sqlite",'feature',-1)
-    writeTrajectoriesToSqlite(features, "/home/francois/Unison/École/12Été/CRSNG/TAAM-Experiments/resultats/testWrite.sqlite", 'feature')
-
 def loadPrototypeMatchIndexesFromSqlite(filename):
     """
     This function loads the prototypes table in the database of name <filename>.
@@ -70,6 +66,7 @@
     return matched_indexes
 
 def testloadPrototypeMatchIndexesFromSqlite():
+    'TODO: write as doctest'
     empty_list = loadPrototypeMatchIndexesFromSqlite("bidon")
     if empty_list == []:
         print "Empty list test Ok"