OSQA-533, fixed some W3C validation errors: closing <img /> tags, removed some unnece...

[osqa.git] / forum_modules / pgfulltext / startup.py

diff --git a/forum_modules/pgfulltext/startup.py b/forum_modules/pgfulltext/startup.py
index 6a6f85d1791850587a44ed070c34d66568fb68d5..d45019fc83e5ac984e9bb306ee704ba9cfdaf8bd 100644 (file)
--- a/forum_modules/pgfulltext/startup.py
+++ b/forum_modules/pgfulltext/startup.py
@@ -1,20 +1,11 @@
 import os\r
 from forum.models import KeyValue\r
 from django.db import connection, transaction\r
+import settings\r
 \r
-KEY = 'PG_FTSTRIGGERS_VERSION'\r
-VERSION = 3\r
-install = False\r
+VERSION = 11\r
 \r
-try:\r
-    version = KeyValue.objects.get(key=KEY).value\r
-    if version < VERSION:\r
-        install = True\r
-except:\r
-    install = True\r
-\r
-\r
-if install:\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
     try:\r
@@ -22,13 +13,7 @@ if install:
         cursor.execute(f.read())\r
         transaction.commit_unless_managed()\r
 \r
-        try:\r
-            kv = KeyValue.objects.get(key=KEY)\r
-        except:\r
-            kv = KeyValue(key=KEY)\r
-\r
-        kv.value = VERSION\r
-        kv.save()\r
+        settings.PG_FTSTRIGGERS_VERSION.set_value(VERSION)\r
         \r
     except Exception, e:\r
         #import sys, traceback\r
@@ -38,3 +23,5 @@ if install:
         cursor.close()\r
 \r
     f.close()\r
+\r
+import handlers\r