[Fusionforge-commits] r14544 - in branches/Branch_5_1: . src/common/include src/common/search
Roland Mas
lolando at fusionforge.org
Wed Oct 5 17:40:22 CEST 2011
Author: lolando
Date: 2011-10-05 17:40:22 +0200 (Wed, 05 Oct 2011)
New Revision: 14544
Modified:
branches/Branch_5_1/
branches/Branch_5_1/src/common/include/database-pgsql.php
branches/Branch_5_1/src/common/search/SearchQuery.class.php
Log:
Search config must be defined as soon as the connection is established, otherwise the indices aren't generated with the same config
Modified: branches/Branch_5_1/src/common/include/database-pgsql.php
===================================================================
--- branches/Branch_5_1/src/common/include/database-pgsql.php 2011-10-05 15:40:12 UTC (rev 14543)
+++ branches/Branch_5_1/src/common/include/database-pgsql.php 2011-10-05 15:40:22 UTC (rev 14544)
@@ -99,6 +99,10 @@
define('SYS_DB_TROVE', $gfconn2);
define('SYS_DB_SEARCH', $gfconn2);
+ db_query_params ('SELECT set_config($1, $2, false)',
+ array('default_text_search_config',
+ 'simple'));
+
// Register top-level "finally" handler to abort current
// transaction in case of error
register_shutdown_function("system_cleanup");
Modified: branches/Branch_5_1/src/common/search/SearchQuery.class.php
===================================================================
--- branches/Branch_5_1/src/common/search/SearchQuery.class.php 2011-10-05 15:40:12 UTC (rev 14543)
+++ branches/Branch_5_1/src/common/search/SearchQuery.class.php 2011-10-05 15:40:22 UTC (rev 14544)
@@ -176,11 +176,6 @@
$qpa = $this->getQuery();
}
- if (forge_get_config('use_fti')) {
- db_query_params ('SELECT set_config($1, $2, false)',
- array('default_text_search_config',
- 'simple'));
- }
$this->result = db_query_qpa (
$qpa,
$this->rowsPerPage + 1,
More information about the Fusionforge-commits
mailing list