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 f5e9eb79bb5fc6ba6057db6a6408e3a22d387633 (commit)
from 5c72dbf32036283ecec72556f919f95dd61d3cbb (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=f5e9eb79bb5fc6ba6057db6a6408e3a22d387633
commit f5e9eb79bb5fc6ba6057db6a6408e3a22d387633
Author: Franck Villaume <[email protected]>
Date: Thu Dec 10 21:08:22 2015 +0100
fix docman search when use_fti set to no & improve fti query: less code
diff --git a/src/common/docman/views/search.php
b/src/common/docman/views/search.php
index 2efe35c..0cac6d9 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -174,11 +174,13 @@ if (session_loggedin()) {
if(!isset($paging) || !$paging)
$paging = 25;
-$docsHtmlSearchRenderer = new DocsHtmlSearchRenderer($searchString, $start,
getStringFromPost('search_type'), $group_id, SEARCH__ALL_SECTIONS, $paging,
$search_options);
-$docsHtmlSearchRenderer->searchQuery->executeQuery();
-$nbDocs = $docsHtmlSearchRenderer->searchQuery->getRowsCount();
-$max = $docsHtmlSearchRenderer->searchQuery->getRowsTotalCount();
-echo $HTML->paging_top($start, $paging, $nbDocs, $max,
$redirect_url.'&view=search');
-$docsHtmlSearchRenderer->writeBody();
-echo $HTML->paging_bottom($start, $paging, $nbDocs,
$redirect_url.'&view=search');
+if ($searchString) {
+ $docsHtmlSearchRenderer = new DocsHtmlSearchRenderer($searchString,
$start, getStringFromPost('search_type'), $group_id, SEARCH__ALL_SECTIONS,
$paging, $search_options);
+ $docsHtmlSearchRenderer->searchQuery->executeQuery();
+ $nbDocs = $docsHtmlSearchRenderer->searchQuery->getRowsCount();
+ $max = $docsHtmlSearchRenderer->searchQuery->getRowsTotalCount();
+ echo $HTML->paging_top($start, $paging, $nbDocs, $max,
$redirect_url.'&view=search');
+ $docsHtmlSearchRenderer->writeBody();
+ echo $HTML->paging_bottom($start, $paging, $nbDocs,
$redirect_url.'&view=search');
+}
echo html_ac(html_ap() -2);
diff --git a/src/common/search/DocsSearchQuery.class.php
b/src/common/search/DocsSearchQuery.class.php
index 24055bd..1941fb8 100644
--- a/src/common/search/DocsSearchQuery.class.php
+++ b/src/common/search/DocsSearchQuery.class.php
@@ -95,7 +95,7 @@ class DocsSearchQuery extends SearchQuery {
$qpa = db_construct_qpa($qpa,
') AS x WHERE ') ;
- $qpa = $this->addIlikeCondition ($qpa,
'full_string_agg') ;
+ $qpa = $this->addIlikeCondition($qpa,
'full_string_agg');
$qpa = db_construct_qpa($qpa,
' ORDER BY x.groupname,
x.title') ;
}
@@ -108,20 +108,12 @@ class DocsSearchQuery extends SearchQuery {
$group_id = $this->groupId;
if (!isset($options['insideDocuments']) ||
!$options['insideDocuments']) {
$qpa = db_construct_qpa(false,
- 'SELECT x.* FROM (SELECT
doc_data.docid, doc_data.filename, ts_headline(doc_data.title, q) AS title,
ts_headline(doc_data.description, q) AS description, doc_groups.groupname,
doc_data.title||$1||description AS full_string_agg, doc_data_idx.vectors FROM
doc_data, doc_groups, doc_data_idx, to_tsquery($2) AS q',
- array ($this->field_separator,
- $words));
- $qpa = db_construct_qpa($qpa,
- ' WHERE doc_data.doc_group =
doc_groups.doc_group AND doc_data.docid = doc_data_idx.docid AND (vectors @@
to_tsquery($1)',
- array ($words)) ;
+ 'SELECT x.* FROM (SELECT
doc_data.docid, doc_data.filename, ts_headline(doc_data.title, q) AS title,
ts_headline(doc_data.description, q) AS description, doc_groups.groupname,
doc_data.title||$1||description AS full_string_agg, doc_data_idx.vectors FROM
doc_data, doc_groups, doc_data_idx, to_tsquery($2) AS q WHERE
doc_data.doc_group = doc_groups.doc_group AND doc_data.docid =
doc_data_idx.docid AND (vectors @@ to_tsquery($2)',
+ array ($this->field_separator, $words));
} else {
$qpa = db_construct_qpa(false,
- 'SELECT x.* FROM (SELECT
doc_data.docid, ts_headline(doc_data.filename, q) AS filename,
ts_headline(doc_data.title, q) AS title, ts_headline(doc_data.description, q)
AS description, doc_groups.groupname,
doc_data.title||$1||description||$1||filename AS full_string_agg,
doc_data_words_idx.vectors FROM doc_data, doc_groups, doc_data_words_idx,
to_tsquery($2) AS q',
- array ($this->field_separator,
- $words));
- $qpa = db_construct_qpa($qpa,
- ' WHERE doc_data.doc_group =
doc_groups.doc_group AND doc_data.docid = doc_data_words_idx.docid AND (vectors
@@ to_tsquery($1)',
- array ($words)) ;
+ 'SELECT x.* FROM (SELECT
doc_data.docid, ts_headline(doc_data.filename, q) AS filename,
ts_headline(doc_data.title, q) AS title, ts_headline(doc_data.description, q)
AS description, doc_groups.groupname,
doc_data.title||$1||description||$1||filename AS full_string_agg,
doc_data_words_idx.vectors FROM doc_data, doc_groups, doc_data_words_idx,
to_tsquery($2) AS q WHERE doc_data.doc_group = doc_groups.doc_group AND
doc_data.docid = doc_data_words_idx.docid AND (vectors @@ to_tsquery($2)',
+ array ($this->field_separator, $words));
}
$qpa = db_construct_qpa($qpa,
') AND doc_data.group_id = $1',
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/search.php | 16 +++++++++-------
src/common/search/DocsSearchQuery.class.php | 18 +++++-------------
2 files changed, 14 insertions(+), 20 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
