Improvements on full text search.

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

diff --git a/forum/models/node.py b/forum/models/node.py
index 3150e992e0d915e7836a3c90707ad87998573394..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
 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
 \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
         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
 \r
     class Meta:\r
         abstract = True\r


@@ -166,6 +166,10 @@ class Node(BaseModel, NodeContent):
     def summary(self):\r
         return strip_tags(self.html)[:300]\r
 \r
     def summary(self):\r
         return strip_tags(self.html)[:300]\r
 \r

+    @models.permalink\r
+    def get_revisions_url(self):\r
+        return ('revisions', (), {'id': self.id})\r
+\r

     def update_last_activity(self, user, save=False):\r
         self.last_activity_by = user\r
         self.last_activity_at = datetime.datetime.now()\r
     def update_last_activity(self, user, save=False):\r
         self.last_activity_by = user\r
         self.last_activity_at = datetime.datetime.now()\r


@@ -181,13 +185,13 @@ class Node(BaseModel, NodeContent):
         revision.save()\r
         return revision\r
 \r
         revision.save()\r
         return revision\r
 \r

-    def create_revision(self, user, action=None, **kwargs):\r
+    def create_revision(self, user, **kwargs):\r

         number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1\r
         revision = self._create_revision(user, number, **kwargs)\r
         number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1\r
         revision = self._create_revision(user, number, **kwargs)\r

-        self.activate_revision(user, revision, action)\r
+        self.activate_revision(user, revision)\r

         return revision\r
 \r
         return revision\r
 \r

-    def activate_revision(self, user, revision, action=None):\r
+    def activate_revision(self, user, revision):\r

         self.title = revision.title\r
         self.tagnames = revision.tagnames\r
         self.body = revision.body\r
         self.title = revision.title\r
         self.tagnames = revision.tagnames\r
         self.body = revision.body\r


@@ -195,9 +199,6 @@ class Node(BaseModel, NodeContent):
         self.active_revision = revision\r
         self.update_last_activity(user)\r
 \r
         self.active_revision = revision\r
         self.update_last_activity(user)\r
 \r

-        if action:\r
-            self.last_edited = action\r
-\r

         self.save()\r
 \r
     def get_tag_list_if_changed(self):\r
         self.save()\r
 \r
     def get_tag_list_if_changed(self):\r


@@ -254,19 +255,6 @@ class Node(BaseModel, NodeContent):
         super(Node, self).save(*args, **kwargs)\r
         if tags is not None: self.tags = tags\r
 \r
         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
     class Meta:\r
         app_label = 'forum'\r
 \r