X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/b484fb008ae574dd4ef10a12d4e530ab96743acc..c9c3cb4c714911710f606f8dc47d5e65707aff67:/forum_modules/pgfulltext/startup.py

diff --git a/forum_modules/pgfulltext/startup.py b/forum_modules/pgfulltext/startup.py
index 14eea8e..cbb4138 100644
--- a/forum_modules/pgfulltext/startup.py
+++ b/forum_modules/pgfulltext/startup.py
@@ -1,38 +1,27 @@
 import os
 from forum.models import KeyValue
 from django.db import connection, transaction
+import settings
 
-KEY = 'PG_FTSTRIGGERS_VERSION'
-VERSION = 2
-install = False
+VERSION = 10
 
-try:
-    version = KeyValue.objects.get(key=KEY).value
-    if version < VERSION:
-        install = True
-except:
-    install = True
-
-
-if install:
+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()
-    except:
+
+        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()
 
-    try:
-        kv = KeyValue.objects.get(key=KEY)
-    except:
-        kv = KeyValue(key=KEY)
-
-    kv.value = VERSION
-    kv.save()
-        
\ No newline at end of file
+import handlers