Author: jablko
Date: Thu Aug 27 13:44:11 2009
New Revision: 3096
Log:
Cosmetic changes
Modified:
trunk/apps/qubit/modules/search/actions/searchAction.class.php
trunk/apps/qubit/modules/search/templates/searchSuccess.php
Modified: trunk/apps/qubit/modules/search/actions/searchAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/searchAction.class.php Thu Aug
27 13:38:58 2009 (r3095)
+++ trunk/apps/qubit/modules/search/actions/searchAction.class.php Thu Aug
27 13:44:11 2009 (r3096)
@@ -34,12 +34,8 @@
$query = new Zend_Search_Lucene_Search_Query_Boolean;
$query->addSubquery(new Zend_Search_Lucene_Search_Query_Term(new
Zend_Search_Lucene_Index_Term($culture, 'culture')), true);
+
$query->addSubquery(Zend_Search_Lucene_Search_QueryParser::parse($request->query,
'UTF-8'), true);
- $parser = new Zend_Search_Lucene_Search_QueryParser;
- $c = $parser->parse(strtolower($request->query), 'UTF-8');
- $query->addSubquery($c, true);
- $this->hits = $search->getEngine()->getIndex()->find($query);
-
- $this->results = new QubitSearchPager($this->hits, $request->page);
+ $this->results = new
QubitSearchPager($search->getEngine()->getIndex()->find($query),
$request->page);
}
}
Modified: trunk/apps/qubit/modules/search/templates/searchSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/search/templates/searchSuccess.php Thu Aug 27
13:38:58 2009 (r3095)
+++ trunk/apps/qubit/modules/search/templates/searchSuccess.php Thu Aug 27
13:44:11 2009 (r3096)
@@ -1,6 +1,6 @@
<?php use_helper('Text') ?>
<?php if ($sf_request->query): ?>
- <h1 class="search"><?php echo __("Search for '%1%' returned %2% results",
array('%1%' => $sf_request->query, '%2%' => count($hits))); ?></h1>
+ <h1 class="search"><?php echo __("Search for '%1%' returned %2% results",
array('%1%' => $sf_request->query, '%2%' => count($results->allHits))); ?></h1>
<?php endif; ?>
<?php foreach ($results->getHits() as $hit): ?>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
