1
=== modified file 'ibid/plugins/factoid.py'
2
--- ibid/plugins/factoid.py	2009-06-17 11:58:36 +0000
3
+++ ibid/plugins/factoid.py	2009-06-20 17:47:50 +0000
4
@@ -2,7 +2,7 @@
5
2
import re
2
import re
6
3
import logging
3
import logging
7
4
4
9
5
from sqlalchemy import Column, Integer, Unicode, DateTime, ForeignKey, UnicodeText, Table, or_
5
from sqlalchemy import Column, Integer, Unicode, DateTime, ForeignKey, UnicodeText, Table, Index, or_
10
6
from sqlalchemy.orm import relation, eagerload
6
from sqlalchemy.orm import relation, eagerload
11
7
from sqlalchemy.sql import func
7
from sqlalchemy.sql import func
12
8
8
13
@@ -20,7 +20,7 @@
14
20
class FactoidName(Base):
20
class FactoidName(Base):
15
21
    __table__ = Table('factoid_names', Base.metadata,
21
    __table__ = Table('factoid_names', Base.metadata,
16
22
    Column('id', Integer, primary_key=True),
22
    Column('id', Integer, primary_key=True),
18
23
    Column('name', Unicode(128), nullable=False),
23
    Column('name', Unicode(128), nullable=False, unique=True),
19
24
    Column('factoid_id', Integer, ForeignKey('factoids.id'), nullable=False),
24
    Column('factoid_id', Integer, ForeignKey('factoids.id'), nullable=False),
20
25
    Column('identity_id', Integer, ForeignKey('identities.id')),
25
    Column('identity_id', Integer, ForeignKey('identities.id')),
21
26
    Column('time', DateTime, nullable=False, default=func.current_timestamp()),
26
    Column('time', DateTime, nullable=False, default=func.current_timestamp()),
22
@@ -30,8 +30,10 @@
23
30
    class FactoidNameSchema(VersionedSchema):
30
    class FactoidNameSchema(VersionedSchema):
24
31
        def upgrade_1_to_2(self):
31
        def upgrade_1_to_2(self):
25
32
            self.add_column(Column('factpack', Integer, ForeignKey('factpacks.id')))
32
            self.add_column(Column('factpack', Integer, ForeignKey('factpacks.id')))
26
33
        def upgrade_2_to_3(self):
27
34
            Index('name', self.table.c.name, unique=True).create(bind=self.upgrade_session.bind)
28
33
35
30
34
    __table__.versioned_schema = FactoidNameSchema(__table__, 2)
36
    __table__.versioned_schema = FactoidNameSchema(__table__, 3)
31
35
37
32
36
    def __init__(self, name, identity_id, factoid_id=None, factpack=None):
38
    def __init__(self, name, identity_id, factoid_id=None, factpack=None):
33
37
        self.name = name
39
        self.name = name
34
@@ -240,9 +242,15 @@
35
240
            event.addresponse(u"That makes no sense, they *are* the same")
242
            event.addresponse(u"That makes no sense, they *are* the same")
36
241
            return
243
            return
37
242
244
39
243
        factoid = event.session.query(Factoid).join(Factoid.names)\
245
        factoid = event.session.query(Factoid).join(Factoid.names) \
40
244
                .filter(func.lower(FactoidName.name)==escape_name(source).lower()).first()
246
                .filter(func.lower(FactoidName.name)==escape_name(source).lower()).first()
41
245
        if factoid:
247
        if factoid:
42
248
            target_factoid = event.session.query(FactoidName) \
43
249
                    .filter(func.lower(FactoidName.name)==escape_name(target).lower()).first()
44
250
            if target_factoid:
45
251
                event.addresponse(u"I already know stuff about %s", target)
46
252
                return
47
253
48
246
            name = FactoidName(escape_name(unicode(target)), event.identity)
254
            name = FactoidName(escape_name(unicode(target)), event.identity)
49
247
            factoid.names.append(name)
255
            factoid.names.append(name)
50
248
            event.session.save_or_update(factoid)
256
            event.session.save_or_update(factoid)
Reviewer	Date Requested	Status
Michael Gorven		Approve on 2009-07-03
Jonathan Hitchcock	2009-06-20	Approve on 2009-06-21
Review via email: mp+7720@code.launchpad.net