1 files changed, 4 insertions, 34 deletions

diff --git a/quoins/model/blog.py b/quoins/model/blog.py
index fb1fa27..a7415d6 100644
--- a/quoins/model/blog.py
+++ b/quoins/model/blog.py
@@ -89,17 +89,7 @@ comment_table = Table('comment', metadata,
     Column('body', TEXT),
     Column('created', DateTime, nullable=False, default=datetime.now),
     Column('approved', Boolean, nullable=False, default=False, index=True),
-)
-
-linkback_table = Table('linkback', metadata,
-    Column('id', Integer, primary_key=True),
-    Column('post_id', Integer, ForeignKey('post.id',
-        onupdate="CASCADE", ondelete="CASCADE"), nullable=False, index=True),
-    Column('url', String(255)),
-    Column('title', Unicode(255)),
-    Column('body', Unicode(255)),
-    Column('name', Unicode(255)),
-    Column('created', DateTime, nullable=False, default=datetime.now),
+    Column('type', String(16), nullable=False, default='comment', index=True),
 )
 
 class Blog(object):
@@ -176,25 +166,15 @@ class Post(object):
             DBSession.delete(t)
         self.tags.remove(t)
 
-    def get_comments_and_linkbacks(self, trackbacks=1, pingbacks=1):
-        objects = self.approved_comments[:]
-        for x in self.linkbacks:
-            if (trackbacks and x.body) or (pingbacks and not x.body):
-                objects.append(x)
-        objects.sort(lambda a,b: cmp(a.created, b.created))
-        return objects
-    comments_and_links = property(get_comments_and_linkbacks)
-
-
 class Media(object):
     pass
 
 class Tag(object):
     pass
 
-class BaseComment(object):
+class Comment(object):
     def get_author_name(self):
-        if hasattr(self, 'author') and self.author:            
+        if self.author:            
             return self.author.display_name
         if self.name:
             return self.name
@@ -202,12 +182,6 @@ class BaseComment(object):
             return self.url
         return 'Anonymous'
     author_name = property(get_author_name)
-        
-class Comment(BaseComment):
-    comment_type = 'comment'
-
-class LinkBack(BaseComment):
-    comment_type = 'linkback'
 
 mapper(Blog, blog_table,
        properties=dict(posts=relation(Post,
@@ -243,13 +217,9 @@ mapper(Post, post_table,
                        unapproved_comments=relation(Comment,
                                                     primaryjoin=and_(comment_table.c.post_id==post_table.c.id,
                                                                      comment_table.c.approved==False)),
-                       media=relation(Media),
-                       linkbacks=relation(LinkBack)))
+                       media=relation(Media)))
 
 mapper(Comment, comment_table,
        order_by=comment_table.c.created,
        properties=dict(post=relation(Post),
                        author=relation(TGUser)))
-
-mapper(LinkBack, linkback_table,
-       properties=dict(post=relation(Post)))