X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/81704cba7ed4c564f21f30e2c12bf08b089ffee8..b31d14a491d01da96d66a44378d15566d8aea927:/forum_modules/pgfulltext/startup.py

diff --git a/forum_modules/pgfulltext/startup.py b/forum_modules/pgfulltext/startup.py
index 32a7992..59990b5 100644
--- a/forum_modules/pgfulltext/startup.py
+++ b/forum_modules/pgfulltext/startup.py
@@ -1,41 +1,27 @@
-import os
-from forum.models import KeyValue
-from django.db import connection, transaction
-
-KEY = 'PG_FTSTRIGGERS_VERSION'
-VERSION = 3
-install = False
-
-try:
-    version = KeyValue.objects.get(key=KEY).value
-    if version < VERSION:
-        install = True
-except:
-    install = True
-
-
-if install:
-    print 'install'
-    f = open(os.path.join(os.path.dirname(__file__), 'pg_fts_install.sql'), 'r')
-
-    try:
-        cursor = connection.cursor()
-        cursor.execute(f.read())
-        transaction.commit_unless_managed()
-
-        try:
-            kv = KeyValue.objects.get(key=KEY)
-        except:
-            kv = KeyValue(key=KEY)
-
-        kv.value = VERSION
-        kv.save()
-        
-    except Exception, e:
-        import sys, traceback
-        traceback.print_exc(file=sys.stdout)
-        pass
-    finally:
-        cursor.close()
-
-    f.close()
+import os
+from forum.models import KeyValue
+from django.db import connection, transaction
+import settings
+
+VERSION = 11
+
+if int(settings.PG_FTSTRIGGERS_VERSION) < VERSION:
+    f = open(os.path.join(os.path.dirname(__file__), 'pg_fts_install.sql'), 'r')
+
+    try:
+        cursor = connection.cursor()
+        cursor.execute(f.read())
+        transaction.commit_unless_managed()
+
+        settings.PG_FTSTRIGGERS_VERSION.set_value(VERSION)
+        
+    except Exception, e:
+        #import sys, traceback
+        #traceback.print_exc(file=sys.stdout)
+        pass
+    finally:
+        cursor.close()
+
+    f.close()
+
+import handlers