equal
deleted
inserted
replaced
40 conn_str = args[0].strip() |
40 conn_str = args[0].strip() |
41 if not re.match("^\w+://.+", conn_str): |
41 if not re.match("^\w+://.+", conn_str): |
42 conn_str = 'sqlite:///' + conn_str |
42 conn_str = 'sqlite:///' + conn_str |
43 |
43 |
44 |
44 |
45 engine, metadata = models.setup_database(conn_str, echo=((options.verbose-options.quiet)>0), create_all=True) |
45 engine, metadata, Session = models.setup_database(conn_str, echo=((options.verbose-options.quiet)>0), create_all=True) |
46 Session = sessionmaker(bind=engine) |
46 session = None |
47 session = Session() |
|
48 try: |
47 try: |
|
48 session = Session() |
49 #conn.row_factory = sqlite3.Row |
49 #conn.row_factory = sqlite3.Row |
50 #curs = conn.cursor() |
50 #curs = conn.cursor() |
51 #curs.execute("create table if not exists tweet_tweet (json);") |
51 #curs.execute("create table if not exists tweet_tweet (json);") |
52 #conn.commit() |
52 #conn.commit() |
53 |
53 |
65 session.flush() |
65 session.flush() |
66 session.commit() |
66 session.commit() |
67 page += 1 |
67 page += 1 |
68 #session.commit() |
68 #session.commit() |
69 finally: |
69 finally: |
70 session.close() |
70 if session: |
|
71 session.close() |
71 |
72 |
72 |
73 |