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, feature/filter-search-results has been updated
via 6b3ebdc2faebbb6620830b0c1c3d2bece425642e (commit)
via 609d0a45efaa924f76d6468bbd11913932aa7b81 (commit)
via 0bb32d41caadc8076d8cd9fb6c8c395d6449c566 (commit)
via ab1c7a8c3fa71ff947344fccbea5d2d30e3501fa (commit)
via 4265773cd634f80a9803a5c7e7f4845857406151 (commit)
via 211fe56d923bdbb36856a22c7df43659b4afed94 (commit)
via d774a35aacc301f42722d3c672a57ae55d347410 (commit)
via eb530bc95b29189dbc6f983bfa9d7ca91845235c (commit)
via 19f47a7757b53f61bce7be2079a1150584e16955 (commit)
from 258afcfe309183cf2e5f6f1552f53c24d734065b (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=6b3ebdc2faebbb6620830b0c1c3d2bece425642e
commit 6b3ebdc2faebbb6620830b0c1c3d2bece425642e
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 14:51:34 2016 +0200
Removed obsolete code
diff --git a/src/common/search/SearchQuery.class.php
b/src/common/search/SearchQuery.class.php
index 95f6929..d976180 100644
--- a/src/common/search/SearchQuery.class.php
+++ b/src/common/search/SearchQuery.class.php
@@ -177,20 +177,6 @@ class SearchQuery extends Error {
}
/**
- * executeQuery - execute the SQL query to get the results
- */
- function executeQuery() {
-
- $this->result = db_query_qpa (
- $this->getQuery(),
- $this->rowsPerPage + 1,
- $this->offset,
- 'SYS_DB_SEARCH'
- );
- $this->rowsCount = min($this->rowsPerPage,
db_numrows($this->result));
- }
-
- /**
* getQuery - returns the query built to get the search results
* This is an abstract method. It _MUST_ be implemented in children
classes.
*
@@ -299,24 +285,6 @@ class SearchQuery extends Error {
}
/**
- * getResult - returns the result set
- *
- * @return resource result set
- */
- function & getResult() {
- return $this->result;
- }
-
- /**
- * getRowsCount - returns number of rows for the current page
- *
- * @return int rows count for the current page
- */
- function getRowsCount() {
- return $this->rowsCount;
- }
-
- /**
* getRowsTotalCount - returns total number of rows
*
* @return int rows count
diff --git a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
index a889cd2..3bcc566 100644
--- a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
@@ -203,13 +203,4 @@ class HtmlSearchRenderer extends SearchRenderer {
return method_exists($this, 'redirectToResult');
}
- /**
- * getResultId - get the field value for the first row of a result
handle
- *
- * @param string $fieldName field name
- * @return string value of the field
- */
- function getResultId($fieldName) {
- return db_result($this->searchQuery->getResult(), 0,
$fieldName);
- }
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=609d0a45efaa924f76d6468bbd11913932aa7b81
commit 609d0a45efaa924f76d6468bbd11913932aa7b81
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 14:47:51 2016 +0200
Update WikiHtmlSearchRenderer with new search
diff --git a/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
b/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
index 6dd6d2c..02c4878 100644
--- a/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
+++ b/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
@@ -56,22 +56,22 @@ class WikiHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
* @return string html output
*/
function getRows() {
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$group = group_get_object($this->groupId);
$group_name = $group->getUnixName();
$return = '';
- for($i = 0; $i < $rowsCount; $i++) {
- $data = unserialize(db_result($result, $i,
'versiondata'));
- $page_name = preg_replace('/%2f/i', '/',
rawurlencode(db_result($result, $i, 'pagename')));
+ $i = 0;
+ foreach ($result as $row) {
+ $data = unserialize($row['versiondata']);
+ $page_name = preg_replace('/%2f/i', '/',
rawurlencode($row['pagename']));
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($i) .'>'
. '<td><a href="/wiki/g/'. $group_name.'/'.
$page_name .'">'
. html_image('ic/msg.png', '10', '12')
- . ' '.db_result($result, $i,
'pagename').'</a></td>
+ . ' '.$row['pagename'].'</a></td>
<td style="width: 15%">'.$data['author'].'</td>
- <td style="width:
15%">'.relative_date(db_result($result, $i, 'mtime')).'</td></tr>';
+ <td style="width:
15%">'.relative_date($row['mtime']).'</td></tr>';
}
return $return;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0bb32d41caadc8076d8cd9fb6c8c395d6449c566
commit 0bb32d41caadc8076d8cd9fb6c8c395d6449c566
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 14:47:40 2016 +0200
Update ForumMLHtmlSearchRenderer with new search
diff --git a/src/plugins/forumml/include/ForumMLHtmlSearchRenderer.class.php
b/src/plugins/forumml/include/ForumMLHtmlSearchRenderer.class.php
index 482e1ac..35003a0 100644
--- a/src/plugins/forumml/include/ForumMLHtmlSearchRenderer.class.php
+++ b/src/plugins/forumml/include/ForumMLHtmlSearchRenderer.class.php
@@ -47,14 +47,14 @@ class ForumMLHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
function getRows() {
$plugin_manager =& PluginManager::instance();
$p =& $plugin_manager->getPluginByName('forumml');
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$dateFormat = _('Y-m-d H:i');
$group = group_get_object($this->groupId);
$group_name = $group->getUnixName();
- $data = unserialize(db_result($result, 0, 'versiondata'));
+ $row = $result[0];
+ $data = unserialize($row['versiondata']);
$return = "<table width='100%'>
<tr>
@@ -69,7 +69,7 @@ class ForumMLHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
</th>
</tr>";
$idx=0;
- while ($rows = db_fetch_array($result)) {
+ foreach ($result as $row) {
$idx++;
if ($idx % 2 == 0) {
$class="boxitemalt bgcolor-white";
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ab1c7a8c3fa71ff947344fccbea5d2d30e3501fa
commit ab1c7a8c3fa71ff947344fccbea5d2d30e3501fa
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 14:43:57 2016 +0200
Update FrsHtmlSearchRenderer with new search
diff --git a/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
index 2eb0e33..4415c69 100644
--- a/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/FrsHtmlSearchRenderer.class.php
@@ -57,17 +57,16 @@ class FrsHtmlSearchRenderer extends HtmlGroupSearchRenderer
{
* @return string html output
*/
function getRows() {
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
$group_id = $this->searchQuery->groupId;
$return = '';
$rowColor = 0;
$lastPackage = null;
- for($i = 0; $i < $rowsCount; $i++) {
+ foreach ($result as $row) {
//section changed
- $currentPackage = db_result($result, $i,
'package_name');
+ $currentPackage = $row['package_name'];
if ($lastPackage != $currentPackage) {
$return .= '<tr><td
colspan="4">'.$currentPackage.'</td></tr>';
$lastPackage = $currentPackage;
@@ -75,9 +74,9 @@ class FrsHtmlSearchRenderer extends HtmlGroupSearchRenderer {
}
$return .= '<tr '.
$GLOBALS['HTML']->boxGetAltRowStyle($rowColor) .'>'
. '<td width="5%"> </td>'
- . '<td>'.util_make_link
('/frs/?view=shownotes&group_id='.$group_id.'&release_id='.db_result($result,
$i, 'release_id'),db_result($result, $i, 'release_name')).'</td>'
- . '<td style="width: 15%">'.db_result($result,
$i, 'realname').'</td>'
- . '<td style="width:
15%">'.relative_date(db_result($result,$i, 'release_date')).'</td></tr>';
+ . '<td>'.util_make_link
('/frs/?view=shownotes&group_id='.$group_id.'&release_id='.$row['release_id'],$row['release_name']).'</td>'
+ . '<td style="width:
15%">'.$row['realname'].'</td>'
+ . '<td style="width:
15%">'.relative_date($row['release_date']).'</td></tr>';
$rowColor ++;
}
return $return;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4265773cd634f80a9803a5c7e7f4845857406151
commit 4265773cd634f80a9803a5c7e7f4845857406151
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 14:41:30 2016 +0200
Update docman/views/search.php with new search
diff --git a/src/common/docman/views/search.php
b/src/common/docman/views/search.php
index 48f362e..061031d 100644
--- a/src/common/docman/views/search.php
+++ b/src/common/docman/views/search.php
@@ -178,8 +178,8 @@ if(!isset($paging) || !$paging)
if ($searchString) {
$docsHtmlSearchRenderer = new DocsHtmlSearchRenderer($searchString,
$start, $isExact, $group_id, SEARCH__ALL_SECTIONS, $paging, $search_options);
- $docsHtmlSearchRenderer->searchQuery->executeQuery();
- $nbDocs = $docsHtmlSearchRenderer->searchQuery->getRowsCount();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
+ $nbDocs = count($result);
$max = $docsHtmlSearchRenderer->searchQuery->getRowsTotalCount();
echo $HTML->paging_top($start, $paging, $nbDocs, $max,
$redirect_url.'&view=search&textsearch='.$searchString);
$docsHtmlSearchRenderer->writeBody();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=211fe56d923bdbb36856a22c7df43659b4afed94
commit 211fe56d923bdbb36856a22c7df43659b4afed94
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 14:39:01 2016 +0200
Update AdvancedSearchHtmlSearchRenderer with new search
diff --git
a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
index bec25e9..e34749a 100644
---
a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
+++
b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
@@ -187,15 +187,15 @@ class AdvancedSearchHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
function getPartResult($renderer, $section, $title='') {
global $HTML;
$result = '';
- $renderer->searchQuery->executeQuery();
- $query = NULL;
if ($title === '')
$title = $section;
$result .= '<h2><a name="'.$section.'"></a>'.$title.'</h2>';
- if ($renderer->searchQuery->getRowsCount() > 0) {
+ $result =
$renderer->searchQuery->getData($renderer->searchQuery->getRowsPerPage(),$renderer->searchQuery->getOffset());
+
+ if (count($result) > 0) {
if ($renderer->searchQuery->getRowsTotalCount() >=
$renderer->searchQuery->getRowsPerPage())
$result .= '<i>' . sprintf(_('Note: only the
first %d results for this category are displayed.'),
$renderer->searchQuery->getRowsPerPage()) . '</i>';
$result .= $HTML->listTabletop($renderer->tableHeaders);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d774a35aacc301f42722d3c672a57ae55d347410
commit d774a35aacc301f42722d3c672a57ae55d347410
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 14:28:27 2016 +0200
Update FullProjectHtmlSearchRenderer with new search
diff --git
a/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
index d14e6b0..1ca47aa 100644
--- a/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
@@ -212,14 +212,13 @@ class FullProjectHtmlSearchRenderer extends
HtmlGroupSearchRenderer {
function getPartResult($renderer, $section, $title='') {
global $HTML;
$result = '';
- $renderer->searchQuery->executeQuery();
if ($title === '')
$title = $section;
$result .= '<h2><a name="'.$section.'"></a>'.$title.'</h2>';
- if ($renderer->searchQuery->getRowsCount() > 0) {
+ if ($renderer->searchQuery->getRowsTotalCount() > 0) {
$result .= $HTML->listTabletop($renderer->tableHeaders);
$result .= $renderer->getRows();
$result .= $HTML->listTableBottom();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=eb530bc95b29189dbc6f983bfa9d7ca91845235c
commit eb530bc95b29189dbc6f983bfa9d7ca91845235c
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 14:03:31 2016 +0200
Update RssSearchRenderer with new search
diff --git a/src/www/export/rss_utils.inc b/src/www/export/rss_utils.inc
index 9451f89..cdc3e8a 100644
--- a/src/www/export/rss_utils.inc
+++ b/src/www/export/rss_utils.inc
@@ -1,5 +1,5 @@
-<?php
-/**
+<?php // -*- mode: php -*-
+/**
* FusionForge Exports: RSS support module
*
* Copyright 1999-2001 (c) VA Linux Systems
@@ -85,3 +85,37 @@ function rss_dump_project_result_set
($res,$title,$desription='',$callback=0) {
// end output
print " </channel>\n";
}
+
+function rss_dump_project_result_array
($result,$title,$desription='',$callback=0) {
+ if (!$desription) $desription=$title;
+ // one time output
+ print " <channel>\n";
+ print " <copyright>Copyright ".date("Y")." ".forge_get_config
('forge_name')."</copyright>\n";
+ print " <pubDate>".rss_date(time())."</pubDate>\n";
+ print " <description>$desription</description>\n";
+ print " <link>http://".forge_get_config ('web_host')."/</link>\n";
+ print " <title>$title</title>\n";
+ print " <webMaster>".forge_get_config ('admin_email')."</webMaster>\n";
+ print " <language>en-us</language>\n";
+
+ // item outputs
+ $addendum = '' ;
+ foreach ($result as $row) {
+ if (!forge_check_perm ('project_read', $row['group_id'])) {
+ continue ;
+ }
+ if ($callback) {
+ $addendum=$callback($row);
+ }
+ print " <item>\n";
+ print "
<title>".htmlspecialchars($row['group_name'])."</title>\n";
+ print "
<link>".util_make_base_url().util_make_url_g($row['unix_group_name'],$row['group_id'])."</link>\n";
+ print " <description>";
+ print preg_replace('[\n\r]','
',rss_description($row['short_description']));
+ print $addendum;
+ print "</description>\n";
+ print " </item>\n";
+ }
+ // end output
+ print " </channel>\n";
+}
diff --git a/src/www/search/include/renderers/RssSearchRenderer.class.php
b/src/www/search/include/renderers/RssSearchRenderer.class.php
index 0dfcd75..b49c350 100644
--- a/src/www/search/include/renderers/RssSearchRenderer.class.php
+++ b/src/www/search/include/renderers/RssSearchRenderer.class.php
@@ -56,11 +56,10 @@ class RssSearchRenderer extends SearchRenderer {
if($searchQuery->isError() || $this->isError()) {
echo '<channel></channel>';
} else {
- $searchQuery->executeQuery();
include_once $GLOBALS['gfwww'].'export/rss_utils.inc';
- rss_dump_project_result_set(
- $searchQuery->getResult(),
+ rss_dump_project_result_array(
+ $searchQuery->getData(),
'GForge Search Results',
'GForge Search Results for
"'.$this->query['words'].'"',
$this->callbackFunction
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=19f47a7757b53f61bce7be2079a1150584e16955
commit 19f47a7757b53f61bce7be2079a1150584e16955
Author: Roland Mas <[email protected]>
Date: Fri Apr 8 14:03:04 2016 +0200
Update SkillHtmlSearchRenderer with new search
diff --git a/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php
index 339a4bd..77235cb 100644
--- a/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/SkillHtmlSearchRenderer.class.php
@@ -64,8 +64,8 @@ class SkillHtmlSearchRenderer extends HtmlSearchRenderer {
* @return string html output
*/
function getRows() {
- $rowsCount = $this->searchQuery->getRowsCount();
- $result =& $this->searchQuery->getResult();
+ $result =
$this->searchQuery->getData($this->searchQuery->getRowsPerPage(),$this->searchQuery->getOffset());
+ $rowsCount = count($result);
$monthArray = array();
for($i = 1; $i <= 12; $i++) {
@@ -74,21 +74,22 @@ class SkillHtmlSearchRenderer extends HtmlSearchRenderer {
$return = '';
- for($i = 0; $i < $rowsCount; $i++) {
- $start = db_result($result, $i, 'start');
+ $i = 0;
+ foreach ($result as $row) {
+ $start = $row['start'];
$startYear = substr($start, 0, 4);
$startMonth = substr($start, 4, 2);
- $finish = db_result($result, $i, 'finish');
+ $finish = $row['finish'];
$finishYear = substr($finish, 0, 4);
$finishMonth = substr($finish, 4, 2);
$return .= '
<tr '.$GLOBALS['HTML']->boxGetAltRowStyle($i).'>
- <td>'.util_make_link_u (db_result($result, $i,
'user_name'),db_result($result, $i, 'user_id'),db_result($result, $i,
'realname')).'</td>
- <td>'.db_result($result, $i, 'type_name').'</td>
- <td>'.db_result($result, $i, 'title').'</td>
- <td>'.db_result($result, $i, 'keywords').'</td>
+ <td>'.util_make_link_u
($row['user_name'],$row['user_id'],$row['realname']).'</td>
+ <td>'.$row['type_name'].'</td>
+ <td>'.$row['title'].'</td>
+ <td>'.$row['keywords'].'</td>
<td>'.$monthArray[$startMonth - 1].'
'.$startYear.'</td>
<td>'.$monthArray[$finishMonth - 1].'
'.$finishYear.'</td>
<tr>';
@@ -101,6 +102,9 @@ class SkillHtmlSearchRenderer extends HtmlSearchRenderer {
* redirectToResult - redirect the user directly to the result when
there is only one matching result
*/
function redirectToResult() {
- session_redirect('/users/'.$this->getResultId('user_name').'/');
+ $result = $this->searchQuery->getData(1)[0];
+ $user_name = $result['user_name'];
+
+ session_redirect('/users/'.$user_name.'/');
}
}
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/views/search.php | 4 +--
src/common/search/SearchQuery.class.php | 32 ------------------
.../include/ForumMLHtmlSearchRenderer.class.php | 8 ++---
.../wiki/common/WikiHtmlSearchRenderer.class.php | 14 ++++----
src/www/export/rss_utils.inc | 38 ++++++++++++++++++++--
.../AdvancedSearchHtmlSearchRenderer.class.php | 6 ++--
.../renderers/FrsHtmlSearchRenderer.class.php | 13 ++++----
.../FullProjectHtmlSearchRenderer.class.php | 3 +-
.../include/renderers/HtmlSearchRenderer.class.php | 9 -----
.../include/renderers/RssSearchRenderer.class.php | 5 ++-
.../renderers/SkillHtmlSearchRenderer.class.php | 24 ++++++++------
11 files changed, 75 insertions(+), 81 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
