Frontend now shows results from search.

diff --git a/com_jmnogosearch/admin/helpers/jmnogosearch.php b/com_jmnogosearch/admin/helpers/jmnogosearch.php
index b00a3afb71d95c672df108d27da75e775138a456..7507f3d88d0df57396de3680b7abd43042f48968 100644 (file)
--- 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 bb74495821c7b30c910511a566c397f7b5512eca..4e4abbfb51b56caa1be99fc94f0e893abfeffbae 100644 (file)
--- 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 7a53507d079ae42358ad9a0ba5083fa740897179..4eab7cefc5b4eb4919af0de73f3c34a5b73ebc81 100644 (file)
--- a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php
+++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php
@@ -52,10 +52,10 @@
                <label for="limit">
                        <?php echo JText::_( 'Display Num' ); ?>
                </label>
-               <?php echo $this->pagination->getLimitBox( ); ?>
+               <?php //echo $this->pagination->getLimitBox( ); ?>
        </div>
        <div>
-               <?php echo $this->pagination->getPagesCounter(); ?>
+               <?php //echo $this->pagination->getPagesCounter(); ?>
        </div>
 </div>
 <?php endif; ?>

diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php
index 7c9635ce61c4bf80a3825ae799873c0917ca6387..a0bbf8e8f74e1d7f20dff280c8af77fdbe6bc9ba 100644 (file)
--- a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php
+++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_results.php
@@ -46,7 +46,7 @@
        <tr>
                <td colspan="3">
                        <div align="center">
-                               <?php echo $this->pagination->getPagesLinks( ); ?>
+                               <?php //echo $this->pagination->getPagesLinks( ); ?>
                        </div>
                </td>
        </tr>

diff --git a/com_jmnogosearch/site/views/jmnogosearch/view.html.php b/com_jmnogosearch/site/views/jmnogosearch/view.html.php
index 2b8280e0af124993280da740c5228ce689d6ce74..fa2269dbfc541b7eba53c47749c450f766368cc9 100644 (file)
--- 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, '<span class="highlight">\0</span>', $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, '<span class="highlight">\0</span>', $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);