FTS triggers update.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@327 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum_modules/pgfulltext/pg_fts_install.sql b/forum_modules/pgfulltext/pg_fts_install.sql
index 4161fd8dce1288d9af0d1d105b33e4cc7a407364..5d5d9b84d25cbb7bdb8f19dc3c7f318658d07db5 100644 (file)
--- a/forum_modules/pgfulltext/pg_fts_install.sql
+++ b/forum_modules/pgfulltext/pg_fts_install.sql
@@ -59,10 +59,10 @@ begin
       setweight(to_tsvector('english', coalesce(body,'')), 'C') INTO doc
       FROM forum_node WHERE id = root_id;
 
       setweight(to_tsvector('english', coalesce(body,'')), 'C') INTO doc
       FROM forum_node WHERE id = root_id;
 

-    SELECT count(*)::int INTO rcount FROM forum_node WHERE abs_parent_id = root_id AND deleted_id IS NULL;
+    SELECT count(*)::int INTO rcount FROM forum_node WHERE abs_parent_id = root_id AND (NOT state_string LIKE '%%deleted%%');

 
     IF rcount > 0 THEN
 
     IF rcount > 0 THEN

-       FOR cv in SELECT setweight(to_tsvector('english', coalesce(body,'')), 'C') FROM forum_node WHERE abs_parent_id = root_id  AND deleted_id IS NULL LOOP
+       FOR cv in SELECT setweight(to_tsvector('english', coalesce(body,'')), 'C') FROM forum_node WHERE abs_parent_id = root_id  AND (NOT state_string LIKE '%%deleted%%') LOOP

            doc :=(doc || cv);
        END LOOP;
      END IF;
            doc :=(doc || cv);
        END LOOP;
      END IF;

diff --git a/forum_modules/pgfulltext/startup.py b/forum_modules/pgfulltext/startup.py
index 22f61a8b409dc10abe9c76fbdff054cd68aa5a22..fc7840b991c38a00fb0434896c548daccf273054 100644 (file)
--- a/forum_modules/pgfulltext/startup.py
+++ b/forum_modules/pgfulltext/startup.py
@@ -3,7 +3,7 @@ from forum.models import KeyValue
 from django.db import connection, transaction\r
 import settings\r
 \r
 from django.db import connection, transaction\r
 import settings\r
 \r

-VERSION = 8\r
+VERSION = 9\r

 \r
 if int(settings.PG_FTSTRIGGERS_VERSION) < VERSION:\r
     f = open(os.path.join(os.path.dirname(__file__), 'pg_fts_install.sql'), 'r')\r
 \r
 if int(settings.PG_FTSTRIGGERS_VERSION) < VERSION:\r
     f = open(os.path.join(os.path.dirname(__file__), 'pg_fts_install.sql'), 'r')\r