diff -r eb885a117aa0 -r 54d7f1486ac4 script/iri_tweet/models.py --- a/script/iri_tweet/models.py Wed Jan 12 13:25:01 2011 +0100 +++ b/script/iri_tweet/models.py Tue Jan 18 10:08:03 2011 +0100 @@ -1,7 +1,7 @@ -from sqlalchemy import Boolean, Table, Column, BigInteger, \ - Integer, String, MetaData, ForeignKey, DateTime +from sqlalchemy import Boolean, Table, Column, BigInteger, Integer, String, \ + MetaData, ForeignKey, DateTime, create_engine from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import relationship, backref, sessionmaker +from sqlalchemy.orm import relationship, backref import datetime import email.utils import simplejson @@ -9,10 +9,11 @@ Base = declarative_base() +APPLICATION_NAME = "IRI_TWITTER" CONSUMER_KEY = "54ThDZhpEjokcMgHJOMnQA" CONSUMER_SECRET = "wUoL9UL2T87tfc97R0Dff2EaqRzpJ5XGdmaN2XK3udA" -ACCESS_TOKEN_KEY= "47312923-LiNTtz0I18YXMVIrFeTuhmH7bOvYsK6p3Ln2Dc" -ACCESS_TOKEN_SECRET = "r3LoXVcjImNAElUpWqTu2SG2xCdWFHkva7xeQoncA" +#ACCESS_TOKEN_KEY= "47312923-LiNTtz0I18YXMVIrFeTuhmH7bOvYsK6p3Ln2Dc" +#ACCESS_TOKEN_SECRET = "r3LoXVcjImNAElUpWqTu2SG2xCdWFHkva7xeQoncA" def adapt_date(date_str): ts = email.utils.parsedate_tz(date_str) @@ -179,6 +180,22 @@ for key, value in kwargs.items(): if hasattr(self,key): setattr(self,key,value) + + +def setup_database(*args, **kwargs): + + create_all = True + if "create_all" in kwargs: + create_all = kwargs["create_all"] + del(kwargs["create_all"]) + + engine = create_engine(*args, **kwargs) + metadata = Base.metadata + + if create_all: + metadata.create_all(engine) + + return (engine, metadata) rest_tweet_tweet = { u'iso_language_code': 'unicode',