Applies patches by Justing Grant. Makes several improvements in the db exporter.

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

diff --git a/forum_modules/pgfulltext/startup.py b/forum_modules/pgfulltext/startup.py
index 14eea8e0b0048decab349f22da352858d48e717b..cbb4138eadde1adc5d48d317e5d34a8efd177abe 100644 (file)
--- a/forum_modules/pgfulltext/startup.py
+++ b/forum_modules/pgfulltext/startup.py
@@ -1,38 +1,27 @@
 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 = 2\r
-install = False\r
+VERSION = 10\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
         cursor = connection.cursor()\r
         cursor.execute(f.read())\r
         transaction.commit_unless_managed()\r
-    except:\r
+\r
+        settings.PG_FTSTRIGGERS_VERSION.set_value(VERSION)\r
+        \r
+    except Exception, e:\r
+        #import sys, traceback\r
+        #traceback.print_exc(file=sys.stdout)\r
         pass\r
     finally:\r
         cursor.close()\r
 \r
     f.close()\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
-        
\ No newline at end of file
+import handlers\r