This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 494dfd019055239e446c43deb41f1ed73a022599 (commit)
from 737a9a701105ea19f90f571fe3f1c8434636e69a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=494dfd019055239e446c43deb41f1ed73a022599
commit 494dfd019055239e446c43deb41f1ed73a022599
Author: Franck Villaume <[email protected]>
Date: Sun Dec 13 18:02:52 2015 +0100
docman search engine: support inside documents with fti set to no
diff --git a/src/common/search/DocsSearchQuery.class.php
b/src/common/search/DocsSearchQuery.class.php
index 783f281..8b0d150 100644
--- a/src/common/search/DocsSearchQuery.class.php
+++ b/src/common/search/DocsSearchQuery.class.php
@@ -102,13 +102,19 @@ class DocsSearchQuery extends SearchQuery {
return $this->getFTIQuery();
} else {
$options = $this->options;
- $qpa = db_construct_qpa(false,
+ if (!isset($options['insideDocuments']) ||
!$options['insideDocuments']) {
+ $qpa = db_construct_qpa(false,
'SELECT x.* FROM (SELECT
doc_data.docid, doc_data.title, doc_data.filename, doc_data.description,
doc_groups.groupname, title||$1||description AS full_string_agg,
groups.group_name as project_name FROM doc_data, doc_groups, groups WHERE
doc_data.doc_group = doc_groups.doc_group AND doc_data.group_id =
groups.group_id ',
array
($this->field_separator));
+ } else {
+ $qpa = db_construct_qpa(false,
+ 'SELECT x.* FROM (SELECT
doc_data.docid, doc_data.title, doc_data.filename, doc_data.description,
doc_groups.groupname, title||$1||description||$1||data_words AS
full_string_agg, groups.group_name as project_name FROM doc_data, doc_groups,
groups WHERE doc_data.doc_group = doc_groups.doc_group AND doc_data.group_id =
groups.group_id ',
+ array
($this->field_separator));
+ }
$qpa = $this->addCommonQPA($qpa);
- $qpa = db_construct_qpa($qpa, ') AS x WHERE ') ;
+ $qpa = db_construct_qpa($qpa, ') AS x WHERE ');
$qpa = $this->addIlikeCondition($qpa,
'full_string_agg');
$qpa = db_construct_qpa($qpa, ' ORDER BY x.groupname,
x.title');
}
-----------------------------------------------------------------------
Summary of changes:
src/common/search/DocsSearchQuery.class.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
