From 54d9b9a6ba0814a8f277a2f43ee62e823ddc0925 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 19 Dec 2009 12:59:39 +0100 Subject: [PATCH] Frontend now shows results from search. --- .../admin/helpers/jmnogosearch.php | 2 +- com_jmnogosearch/site/models/jmnogosearch.php | 46 +++++----- .../views/jmnogosearch/tmpl/default_form.php | 4 +- .../jmnogosearch/tmpl/default_results.php | 2 +- .../site/views/jmnogosearch/view.html.php | 87 ++++++++++--------- 5 files changed, 69 insertions(+), 72 deletions(-) diff --git a/com_jmnogosearch/admin/helpers/jmnogosearch.php b/com_jmnogosearch/admin/helpers/jmnogosearch.php index b00a3af..7507f3d 100644 --- a/com_jmnogosearch/admin/helpers/jmnogosearch.php +++ b/com_jmnogosearch/admin/helpers/jmnogosearch.php @@ -128,7 +128,7 @@ class JMnoGoSearchHelper // replace line breaking tags with whitespace $text = preg_replace( "'<(br[^/>]*?/|hr[^/>]*?/|/(div|h[1-6]|li|p|td))>'si", ' ', $text ); - return SearchHelper::_smartSubstr( strip_tags( $text ), $length, $searchword ); + return JMnoGoSearchHelper::_smartSubstr( strip_tags( $text ), $length, $searchword ); } /** diff --git a/com_jmnogosearch/site/models/jmnogosearch.php b/com_jmnogosearch/site/models/jmnogosearch.php index bb74495..4e4abbf 100644 --- a/com_jmnogosearch/site/models/jmnogosearch.php +++ b/com_jmnogosearch/site/models/jmnogosearch.php @@ -25,8 +25,10 @@ jimport('joomla.application.component.model'); */ class JMnoGoSearchModelJMnoGoSearch extends JModel { + var $_agent = null; + /** - * Sezrch data array + * Search data array * * @var array */ @@ -49,7 +51,7 @@ class JMnoGoSearchModelJMnoGoSearch extends JModel /** * Constructor * - * @since 1.5 + * @since 1.0 */ function __construct() { @@ -106,32 +108,24 @@ class JMnoGoSearchModelJMnoGoSearch extends JModel if (empty($this->_data)) { /* TODO must be configurable */ - $agent = udm_alloc_agent ('pgsql://postgres:postgres@localhost/mnogosearch/?dbmode=single'); - - $mResult = udm_find ($agent,'works'); - - JPluginHelper::importPlugin( 'search'); - $dispatcher =& JDispatcher::getInstance(); - $results = $dispatcher->trigger( 'onSearch', array( - $this->getState('keyword'), - $this->getState('match'), - $this->getState('ordering'), - $areas['active']) ); - - $rows = array(); - foreach($results AS $result) { - $rows = array_merge( (array) $rows, (array) $result); - } - - $this->_total = udm_get_res_param ($mResult, UDM_PARAM_FOUND); - if($this->getState('limit') > 0) { - $this->_data = array_splice($rows, $this->getState('limitstart'), $this->getState('limit')); + $this->_agent = udm_alloc_agent ('pgsql://postgres:postgres@localhost/mnogosearch/?dbmode=single'); + + $keyword = $this->getState('keyword'); + if (trim($keyword) != '') + { + $mResult = udm_find ($this->_agent, $keyword); + + $this->_total = udm_get_res_param ($mResult, UDM_PARAM_FOUND); + /*if ($this->getState('limit') > 0) { + $this->_data = array_splice($rows, $this->getState('limitstart'), $this->getState('limit')); + } else { + $this->_data = $rows; + }*/ + $this->_data = $mResult; } else { - $this->_data = $rows; + $this->_total = 0; + $this->_data = null; } - - udm_free_res ($mResult); - udm_free_agent ($agent); } return $this->_data; diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php index 7a53507..4eab7ce 100644 --- a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php +++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php @@ -52,10 +52,10 @@ - pagination->getLimitBox( ); ?> + pagination->getLimitBox( ); ?>
- pagination->getPagesCounter(); ?> + pagination->getPagesCounter(); ?>
diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php index 7c9635c..a0bbf8e 100644 --- a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php +++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php @@ -46,7 +46,7 @@
- pagination->getPagesLinks( ); ?> + pagination->getPagesLinks( ); ?>
diff --git a/com_jmnogosearch/site/views/jmnogosearch/view.html.php b/com_jmnogosearch/site/views/jmnogosearch/view.html.php index 2b8280e..fa2269d 100644 --- a/com_jmnogosearch/site/views/jmnogosearch/view.html.php +++ b/com_jmnogosearch/site/views/jmnogosearch/view.html.php @@ -66,10 +66,10 @@ class JMnoGoSearchViewJMnoGoSearch extends JView // built select lists $orders = array(); + $orders[] = JHTML::_('select.option', 'relevancy', JText::_( 'Relevancy' ) ); $orders[] = JHTML::_('select.option', 'newest', JText::_( 'Newest first' ) ); $orders[] = JHTML::_('select.option', 'oldest', JText::_( 'Oldest first' ) ); - $orders[] = JHTML::_('select.option', 'popular', JText::_( 'Most popular' ) ); - $orders[] = JHTML::_('select.option', 'alpha', JText::_( 'Alphabetical' ) ); + $orders[] = JHTML::_('select.option', 'title', JText::_( 'Title' ) ); $lists = array(); $lists['ordering'] = JHTML::_('select.genericlist', $orders, 'ordering', 'class="inputbox"', 'value', 'text', $state->get('ordering') ); @@ -84,7 +84,6 @@ class JMnoGoSearchViewJMnoGoSearch extends JView JMnoGoSearchHelper::logSearch($searchword); //limit searchword - if (JMnoGoSearchHelper::limitSearchWord($searchword)) { $error = JText::_( 'SEARCH_MESSAGE' ); } @@ -102,60 +101,64 @@ class JMnoGoSearchViewJMnoGoSearch extends JView // for next release, the checks should be done in the model perhaps... $state->set('keyword', $searchword); - if(!$error) + $results_to_show = null; + if (!$error) { + $results_to_show = array (); + $results = &$this->get('data'); $total = &$this->get('total'); - $pagination = &$this->get('pagination'); + //$pagination = &$this->get('pagination'); require_once (JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); - for ($i=0; $i < count($results); $i++) + if ($results != null) { - $row = &$results[$i]->text; - - if ($state->get('match') == 'exact') + $firstRow = udm_get_res_param ($results, UDM_PARAM_FIRST_DOC); + $lastRow = udm_get_res_param ($results, UDM_PARAM_LAST_DOC); + for ($i = $firstRow - 1; $i < $lastRow; $i++) { - $searchwords = array($searchword); - $needle = $searchword; + $row = new stdClass(); + $row->text = udm_get_res_field ($results, $i, UDM_FIELD_TEXT); + + if ($state->get('match') == 'exact') + { + $searchwords = array($searchword); + $needle = $searchword; + } + else + { + $searchwords = preg_split("/\s+/u", $searchword); + $needle = $searchwords[0]; + } + + $row->text = JMnoGoSearchHelper::prepareSearchContent( $row->text, 200, $needle ); + $searchwords = array_unique( $searchwords ); + $searchRegex = '#('; + $x = 0; + foreach ($searchwords as $k => $hlword) + { + $searchRegex .= ($x == 0 ? '' : '|'); + $searchRegex .= preg_quote($hlword, '#'); + $x++; + } + $searchRegex .= ')#iu'; + + $row->text = preg_replace($searchRegex, '\0', $row->text ); + $row->href = udm_get_res_field ($results, $i, UDM_FIELD_URL); + $row->title = udm_get_res_field ($results, $i, UDM_FIELD_TITLE); + $row->created = udm_get_res_field ($results, $i, UDM_FIELD_MODIFIED); + $row->count = udm_get_res_field ($results, $i, UDM_FIELD_ORDER); + + $results_to_show[] = $row; } - else - { - $searchwords = preg_split("/\s+/u", $searchword); - $needle = $searchwords[0]; - } - - $row = JMnoGoSearchHelper::prepareSearchContent( $row, 200, $needle ); - $searchwords = array_unique( $searchwords ); - $searchRegex = '#('; - $x = 0; - foreach ($searchwords as $k => $hlword) - { - $searchRegex .= ($x == 0 ? '' : '|'); - $searchRegex .= preg_quote($hlword, '#'); - $x++; - } - $searchRegex .= ')#iu'; - - $row = preg_replace($searchRegex, '\0', $row ); - - $result =& $results[$i]; - if ($result->created) { - $created = JHTML::Date ( $result->created ); - } - else { - $created = ''; - } - - $result->created = $created; - $result->count = $i + 1; } } $this->result = JText::sprintf( 'TOTALRESULTSFOUND', $total ); $this->assignRef('pagination', $pagination); - $this->assignRef('results', $results); + $this->assignRef('results', $results_to_show); $this->assignRef('lists', $lists); $this->assignRef('params', $params); -- 2.49.0