From 07e49a7e5f413118d7af7119b191c4c140e72e78 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Fri, 31 Oct 2014 15:12:56 +0100
Subject: [PATCH] use TokenBigramSplitSymbolAlpha parser and
 MroongaBooleanFullText search key.

Note that similarity search in MroongaFullText search key does not give good results with TokenBigramSplitSymbolAlpha parser.
---
 .../erp5_mysql_innodb/z_create_catalog_fulltext.xml       | 4 ++--
 .../erp5_mysql_innodb/z_create_content_translation.xml    | 2 +-
 .../erp5_mysql_innodb/z_create_fulltext.xml               | 2 +-
 .../CatalogSearchKeyTemplateItem/search_key_list.xml      | 8 ++++----
 .../bt/template_catalog_search_key_list                   | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog_fulltext.xml b/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog_fulltext.xml
index ea1e2e5f17..3cac0e0afb 100644
--- a/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog_fulltext.xml
+++ b/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog_fulltext.xml
@@ -67,8 +67,8 @@ CREATE TABLE `catalog_full_text` (\n
   `title` varchar(255) default \'\',\n
   `description` text,\n
   PRIMARY KEY  (`uid`),\n
-  FULLTEXT `title` (`title`),\n
-  FULLTEXT `description` (`description`)\n
+  FULLTEXT `title` (`title`) COMMENT \'parser "TokenBigramSplitSymbolAlpha"\',\n
+  FULLTEXT `description` (`description`) COMMENT \'parser "TokenBigramSplitSymbolAlpha"\'\n
 ) ENGINE=mroonga;\n
 </string> </value>
         </item>
diff --git a/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml b/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml
index 6fca1aaac5..7b1a162804 100644
--- a/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml
+++ b/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_content_translation.xml
@@ -64,7 +64,7 @@
   `content_language` VARBINARY(100),\n
   `translated_text` TEXT,\n
   PRIMARY KEY (`uid`, `property_name`, `content_language`),\n
-  FULLTEXT KEY (`translated_text`)\n
+  FULLTEXT KEY (`translated_text`) COMMENT \'parser "TokenBigramSplitSymbolAlpha"\'\n
 ) ENGINE=mroonga;\n
 </string> </value>
         </item>
diff --git a/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml b/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml
index c0ae591177..bcdfe1141f 100644
--- a/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml
+++ b/bt5/erp5_full_text_mroonga_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_fulltext.xml
@@ -66,7 +66,7 @@ CREATE TABLE `full_text` (\n
   `uid` BIGINT UNSIGNED NOT NULL,\n
   `SearchableText` MEDIUMTEXT,\n
   PRIMARY KEY  (`uid`),\n
-  FULLTEXT `SearchableText` (`SearchableText`)\n
+  FULLTEXT `SearchableText` (`SearchableText`) COMMENT \'parser "TokenBigramSplitSymbolAlpha"\'\n
 ) ENGINE=mroonga;\n
 </string> </value>
         </item>
diff --git a/bt5/erp5_full_text_mroonga_catalog/CatalogSearchKeyTemplateItem/search_key_list.xml b/bt5/erp5_full_text_mroonga_catalog/CatalogSearchKeyTemplateItem/search_key_list.xml
index 46b3dbec6f..caead947b5 100644
--- a/bt5/erp5_full_text_mroonga_catalog/CatalogSearchKeyTemplateItem/search_key_list.xml
+++ b/bt5/erp5_full_text_mroonga_catalog/CatalogSearchKeyTemplateItem/search_key_list.xml
@@ -1,8 +1,8 @@
 <key_list>
- <key>SearchableText | MroongaFullTextKey</key>
- <key>catalog_full_text.description | MroongaFullTextKey</key>
+ <key>SearchableText | MroongaBooleanFullTextKey</key>
+ <key>catalog_full_text.description | MroongaBooleanFullTextKey</key>
  <key>catalog_full_text.title | MroongaBooleanFullTextKey</key>
- <key>description | MroongaFullTextKey</key>
- <key>full_text.SearchableText | MroongaFullTextKey</key>
+ <key>description | MroongaBooleanFullTextKey</key>
+ <key>full_text.SearchableText | MroongaBooleanFullTextKey</key>
  <key>title | MroongaBooleanFullTextKey</key>
 </key_list>
\ No newline at end of file
diff --git a/bt5/erp5_full_text_mroonga_catalog/bt/template_catalog_search_key_list b/bt5/erp5_full_text_mroonga_catalog/bt/template_catalog_search_key_list
index 326424bfc2..3c63ebce67 100644
--- a/bt5/erp5_full_text_mroonga_catalog/bt/template_catalog_search_key_list
+++ b/bt5/erp5_full_text_mroonga_catalog/bt/template_catalog_search_key_list
@@ -1,6 +1,6 @@
-SearchableText | MroongaFullTextKey
-catalog_full_text.description | MroongaFullTextKey
+SearchableText | MroongaBooleanFullTextKey
+catalog_full_text.description | MroongaBooleanFullTextKey
 catalog_full_text.title | MroongaBooleanFullTextKey
-description | MroongaFullTextKey
-full_text.SearchableText | MroongaFullTextKey
+description | MroongaBooleanFullTextKey
+full_text.SearchableText | MroongaBooleanFullTextKey
 title | MroongaBooleanFullTextKey
\ No newline at end of file
-- 
2.30.9