add uniq; fix name of index to be cooler, fix a typo in comment, and most importantly use lastrowid instead of asking max (eg. play a little less with db
This commit is contained in:
parent
648a862811
commit
8fd42ee7d8
|
@ -30,7 +30,7 @@ cur = con.cursor()
|
||||||
cur.executescript(
|
cur.executescript(
|
||||||
'''
|
'''
|
||||||
CREATE TABLE jids(
|
CREATE TABLE jids(
|
||||||
jid_id INTEGER PRIMARY KEY AUTOINCREMENT,
|
jid_id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE,
|
||||||
jid TEXT UNIQUE
|
jid TEXT UNIQUE
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -98,13 +98,14 @@ def visit(arg, dirname, filenames):
|
||||||
# jid is already in the DB, don't create the table, just get his jid_id
|
# jid is already in the DB, don't create the table, just get his jid_id
|
||||||
if jid in jids_already_in:
|
if jid in jids_already_in:
|
||||||
cur.execute('SELECT jid_id FROM jids WHERE jid="%s"' % jid)
|
cur.execute('SELECT jid_id FROM jids WHERE jid="%s"' % jid)
|
||||||
|
JID_ID = cur.fetchone()[0]
|
||||||
else:
|
else:
|
||||||
jids_already_in.append(jid)
|
jids_already_in.append(jid)
|
||||||
cur.execute('INSERT INTO jids (jid) VALUES (?)', (jid,))
|
cur.execute('INSERT INTO jids (jid) VALUES (?)', (jid,))
|
||||||
con.commit()
|
con.commit()
|
||||||
|
|
||||||
cur.execute('SELECT MAX(jid) FROM jids')
|
JID_ID = cur.lastrowid
|
||||||
JID_ID = cur.fetchone()[0]
|
|
||||||
|
|
||||||
f = open(path_to_text_file, 'r')
|
f = open(path_to_text_file, 'r')
|
||||||
lines = f.readlines()
|
lines = f.readlines()
|
||||||
|
@ -118,7 +119,7 @@ def visit(arg, dirname, filenames):
|
||||||
message_data = splitted_line[2:] # line[2:] has message data
|
message_data = splitted_line[2:] # line[2:] has message data
|
||||||
# line[0] is date,
|
# line[0] is date,
|
||||||
|
|
||||||
# some lines can be fucked up, just trop them
|
# some lines can be fucked up, just drop them
|
||||||
try:
|
try:
|
||||||
tim = int(float(splitted_line[0]))
|
tim = int(float(splitted_line[0]))
|
||||||
except:
|
except:
|
||||||
|
@ -160,6 +161,6 @@ if __name__ == '__main__':
|
||||||
cur.executescript(
|
cur.executescript(
|
||||||
'''
|
'''
|
||||||
CREATE UNIQUE INDEX jids_already_index ON jids (jid);
|
CREATE UNIQUE INDEX jids_already_index ON jids (jid);
|
||||||
CREATE INDEX JID_ID_Index ON logs (jid_id);
|
CREATE INDEX jid_id_index ON logs (jid_id);
|
||||||
'''
|
'''
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue