diff -r 2209e66bb50b -r 500cd0405c7a script/lib/iri_tweet/tweet_twitter_user.py --- a/script/lib/iri_tweet/tweet_twitter_user.py Fri Aug 12 18:17:27 2011 +0200 +++ b/script/lib/iri_tweet/tweet_twitter_user.py Wed Aug 17 18:32:07 2011 +0200 @@ -1,6 +1,6 @@ from iri_tweet.models import setup_database, Message, UserMessage, User from iri_tweet.utils import (get_oauth_token, get_user_query, set_logging_options, - set_logging, parse_date, logger) + set_logging, parse_date, get_logger) from optparse import OptionParser #@UnresolvedImport from sqlalchemy import BigInteger from sqlalchemy.orm import sessionmaker @@ -10,6 +10,7 @@ import sys import time import twitter +import re APPLICATION_NAME = "Tweet recorder user" CONSUMER_KEY = "Vdr5ZcsjI1G3esTPI8yDg" @@ -58,7 +59,11 @@ if not options.message or len(options.message) == 0: sys.exit() - engine, metadata = setup_database('sqlite:///'+options.database, echo=((options.verbose-options.quiet)>0), create_all = True) + conn_str = options.database.strip() + if not re.match("^\w+://.+", conn_str): + conn_str = 'sqlite:///' + conn_str + + engine, metadata = setup_database(conn_str, echo=((options.verbose-options.quiet)>0), create_all = False) Session = sessionmaker() conn = engine.connect() @@ -107,7 +112,7 @@ screen_name = user.screen_name message = u"@%s: %s" % (screen_name, base_message) - logger.debug("new status : " + message) #@UndefinedVariable + get_logger.debug("new status : " + message) #@UndefinedVariable if not options.simulate: t.statuses.update(status=message) user_message = UserMessage(user_id=user.id, message_id=message_obj.id)