tonyair/doc.silverstripe.org
1
0
Fork 0
mirror of https://github.com/silverstripe/doc.silverstripe.org synced 2024-10-22 15:05:50 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Fixed search results turning empty titles. BUGFIX: fixed Zend_Lucene conflict with include paths

Browse Source 
git-svn-id: http://svn.silverstripe.com/projects/ss2doc/branches/v2@118238 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Will Rossiter 2011-04-26 23:56:52 +00:00
parent c39809cfae
commit df3466a010
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sapphiredocs/code/DocumentationSearch.php
View File

@ -136,7 +136,12 @@ class DocumentationSearch {
self::$enabled = true; self::$enabled = true;
// include the zend search functionality // include the zend search functionality
set_include_path(get_include_path() . PATH_SEPARATOR . dirname(dirname(__FILE__)) . '/thirdparty/'); set_include_path(
dirname(dirname(__FILE__)) . '/thirdparty/'. PATH_SEPARATOR .
get_include_path()
);
require_once 'Zend/Search/Lucene.php';
} }
/** /**
@ -164,10 +169,9 @@ class DocumentationSearch {
* Perform a search query on the index * Perform a search query on the index
*/ */
public function performSearch() { public function performSearch() {
require_once 'Zend/Search/Lucene.php';
try { try {
$index = Zend_Search_Lucene::open(self::get_index_location()); $index = Zend_Search_Lucene::open(self::get_index_location());
Zend_Search_Lucene::setResultSetLimit(200); Zend_Search_Lucene::setResultSetLimit(200);
$this->results = $index->find($this->getQuery()); $this->results = $index->find($this->getQuery());

13
sapphiredocs/templates/Layout/DocumentationViewer_results.ss
View File

@ -4,10 +4,15 @@
<% if Results %> <% if Results %>
<p>Showing page $ThisPage of $TotalPages</p> <p>Showing page $ThisPage of $TotalPages</p>
<% control Results %>
<h3><a href="$Link">$BreadcrumbTitle</a></h3> <ul>
<p>$Content.LimitCharacters(200)</p> <% control Results %>
<% end_control %> <li>
<h3><a href="$Link"><% if BreadcrumbTitle %>$BreadcrumbTitle<% else %>$Title<% end_if %></a></h3>
<p>$Content.LimitCharacters(200)</p>
</li>
<% end_control %>
</ul>
<% if SearchPages %> <% if SearchPages %>
<ul class="pagination"> <ul class="pagination">