cleaned up mysql-specific utility functions

1 files changed, 7 insertions, 22 deletions

diff --git a/askbot/search/mysql.py b/askbot/search/mysql.py
index df86070d..055b30ca 100644
--- a/askbot/search/mysql.py
+++ b/askbot/search/mysql.py
@@ -1,7 +1,6 @@
+"""Utilities for the MySQL backend"""
 from django.db import connection
 
-SUPPORTS_FTS = None
-HINT_TABLE = None
 NO_FTS_WARNING = """
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!                                                  !!
@@ -11,22 +10,15 @@ NO_FTS_WARNING = """
 !!                                                  !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 """
+SUPPORTS_FTS = None
 
-def supports_full_text_search(hint_table = None):
-    """True if the database engine is MyISAM
-    hint_table - is the table that we look into to determine
-    whether database supports FTS or not.
-    """
+def supports_full_text_search():
+    """True if the database engine is MyISAM"""
+    from askbot.models import Post
     global SUPPORTS_FTS
-    global HINT_TABLE
     if SUPPORTS_FTS is None:
         cursor = connection.cursor()
-        if hint_table:
-            table_name = hint_table
-            HINT_TABLE = hint_table
-        else:
-            from askbot.models import Post
-            table_name = Post._meta.db_table
+        table_name = Post._meta.db_table
         cursor.execute("SHOW CREATE TABLE %s" % table_name)
         data = cursor.fetchone()
         if 'ENGINE=MyISAM' in data[1]:
@@ -35,19 +27,12 @@ def supports_full_text_search(hint_table = None):
             SUPPORTS_FTS = False
     return SUPPORTS_FTS
 
-                question_index_sql = get_create_full_text_index_sql(
-                                                index_name,
-                                                table_namee,
-                                                ('title','text','tagnames',)
-                                            )
 def get_create_full_text_index_sql(index_name, table_name, column_list):
     cursor = connection.cursor()
     column_sql = '(%s)' % ','.join(column_list)
     sql = 'CREATE FULLTEXT INDEX %s on %s %s' % (index_name, table_name, column_sql)
-    cursor.execute(question_index_sql)
+    cursor.execute(sql)
     return sql
-            else:
-                print NO_FTS_WARNING
 
 def get_drop_index_sql(index_name, table_name):
     return 'ALTER TABLE %s DROP INDEX %s' % (table_name, index_name)