Improvements on full text search.

[osqa.git] / forum / models / node.py

diff --git a/forum/models/node.py b/forum/models/node.py
index 7c09189b7f1228858d5a232f646a26cfaa2b2dcd..cf69233334823d03b8d66ffc78e4c1e4f2672fd4 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -1,4 +1,3 @@
-from forum.akismet import *\r
 from base import *\r
 from tag import Tag\r
 \r
@@ -31,12 +30,13 @@ class NodeContent(models.Model):
 \r
     def tagname_list(self):\r
         if self.tagnames:\r
-            return [name for name in self.tagnames.split(u' ')]\r
+            t = [name.strip() for name in self.tagnames.split(u' ') if name]\r
+            return [name.strip() for name in self.tagnames.split(u' ') if name]\r
         else:\r
             return []\r
 \r
     def tagname_meta_generator(self):\r
-        return u','.join([unicode(tag) for tag in self.tagname_list()])\r
+        return u','.join([tag for tag in self.tagname_list()])\r
 \r
     class Meta:\r
         abstract = True\r
@@ -255,19 +255,6 @@ class Node(BaseModel, NodeContent):
         super(Node, self).save(*args, **kwargs)\r
         if tags is not None: self.tags = tags\r
 \r
-    @staticmethod\r
-    def isSpam(comment, data):\r
-        api = Akismet()\r
-\r
-        if not api.key:\r
-            return False\r
-        else:\r
-            if api.comment_check(comment, data):\r
-                return True\r
-            else:\r
-                return False\r
-        return data\r
-\r
     class Meta:\r
         app_label = 'forum'\r
 \r