for x in cols.iterkeys():
sorted[cols[x]] = x
for x in sorted:
- create += (', %s %s' % (x, type))
+ create += (", '%s' %s" % (x, type))
create += ');'
return create
c = self.conn.cursor()
c.execute('drop table if exists ' + self.evtab)
c.execute('drop table if exists ' + self.ctxtab)
- c.execute(self.create_table(self.ctxcols, self.ctxtab, 'char(80)', 'unique'))
- c.execute(self.create_table(self.evcols, self.evtab, 'double default null', ''))
+ table_ctx = self.create_table(self.ctxcols, self.ctxtab, 'char(80)', 'unique')
+ c.execute(table_ctx)
+ table_ev = self.create_table(self.evcols, self.evtab, 'double default null', '')
+ c.execute(table_ev)
self.conn.commit()
if options.verbose:
def __init__(self, options, tables, ctxcols, evcols):
import sqlite3
+ if options.database == None:
+ print "Have to specify database (file-)name for sqlite"
+ sys.exit(1)
+
if os.path.isfile(options.database):
os.unlink(options.database)
self.ctxtab = tables['ctx']
self.evtab = tables['ev']
self.conn = sqlite3.connect(options.database)
- self.conn.execute(self.create_table(ctxcols, self.ctxtab, 'text', 'unique'))
- self.conn.execute(self.create_table(evcols, self.evtab, 'double', ''))
+ table_ctx = self.create_table(ctxcols, self.ctxtab, 'text', 'unique')
+ self.conn.execute(table_ctx)
+ self.conn.execute("CREATE INDEX IF NOT EXISTS ctxindex ON ctx(id)")
+ table_ev = self.create_table(evcols, self.evtab, 'double', '')
+ self.conn.execute(table_ev)
+ self.conn.execute("CREATE INDEX IF NOT EXISTS evindex ON ev(id)")
n = max(len(ctxcols), len(evcols)) + 1
q = ['?']
q.append('?')
def ev(self, curr_id, evitems):
- keys = ','.join(evitems.keys())
- stmt = 'insert into %s (id, %s) values (%s)' % (self.evtab, keys, self.quests[len(evitems)])
+ keys = ""
+ first = True
+ for key in evitems.keys():
+ if first:
+ first = False
+ else:
+ keys += ", "
+ keys += "'%s'" % (key)
+
+ stmt = "insert into '%s' (id, %s) values (%s)" % (self.evtab, keys, self.quests[len(evitems)])
self.conn.execute(stmt, (curr_id,) + tuple(evitems.values()))
def ctx(self, curr_id, ctxitems):
- keys = ','.join(ctxitems.keys())
- stmt = 'insert into %s (id, %s) values (%s)' % (self.ctxtab, keys, self.quests[len(ctxitems)])
+ keys = ""
+ first = True
+ for key in ctxitems.keys():
+ if first:
+ first = False
+ else:
+ keys += ", "
+ keys += "'%s'" % (key)
+
+ stmt = "insert into '%s' (id, %s) values (%s)" % (self.ctxtab, keys, self.quests[len(ctxitems)])
self.conn.execute(stmt, (curr_id,) + tuple(ctxitems.values()))
def commit(self):
self.valid_keys = set()
- for line in self.input():
+ inp = self.input()
+
+ for line in inp:
if line[0] == 'P':
ind = line.index(';', 2)
key = line[2:ind]
- if not key in ctxcols:
+ if not ctxcols.has_key(key):
ctxcols[key] = ctxind
ctxind += 1
key = line[2:ind]
if self.filter.match(key):
self.n_events += 1
- if not key in evcols:
+ if not evcols.has_key(key):
self.valid_keys.add(key)
evcols[key] = evind
evind += 1
lineno = 0
ids = 0
curr_id = 0
+ last_push_curr_id = 0
keystack = []
idstack = []
curr_event = 0
if op == 'P':
# flush the current events
if len(evcols):
- self.emit.ev(curr_id, evcols)
+ self.emit.ev(last_push_curr_id, evcols)
evcols.clear()
# push the key
val = items[2]
keystack.append(key)
curr_id = ids
+ last_push_curr_id = curr_id
ids += 1
idstack.append(curr_id)
ctxcols[key] = val