From 65386c59840dffd19488e6c90ea2cef8ebf65d0a Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 19 Dec 2009 11:29:15 +0100 Subject: [PATCH] Some bugfixes and started frontend. --- com_jmnogosearch/jmnogosearch.xml | 15 ++++ com_jmnogosearch/site/controller.php | 35 ++++---- com_jmnogosearch/site/jmnogosearch.php | 8 +- com_jmnogosearch/site/models/jmnogosearch.php | 86 +++++-------------- com_jmnogosearch/site/router.php | 14 +-- .../site/views/jmnogosearch/tmpl/default.xml | 6 +- .../views/jmnogosearch/tmpl/default_form.php | 16 +--- .../site/views/jmnogosearch/view.html.php | 85 +++++++++--------- mod_jmnogosearch/helper.php | 8 +- mod_jmnogosearch/mod_jmnogosearch.php | 4 +- mod_jmnogosearch/tmpl/default.php | 6 +- 11 files changed, 116 insertions(+), 167 deletions(-) diff --git a/com_jmnogosearch/jmnogosearch.xml b/com_jmnogosearch/jmnogosearch.xml index affcd23..f45c718 100644 --- a/com_jmnogosearch/jmnogosearch.xml +++ b/com_jmnogosearch/jmnogosearch.xml @@ -24,7 +24,22 @@ + controller.php index.html + jmnogosearch.php + router.php + models/index.html + models/jmnogosearch.php + views/index.html + views/jmnogosearch/index.html + views/jmnogosearch/metadata.xml + views/jmnogosearch/view.html.php + views/jmnogosearch/tmpl/default.php + views/jmnogosearch/tmpl/default.xml + views/jmnogosearch/tmpl/default_error.php + views/jmnogosearch/tmpl/default_form.php + views/jmnogosearch/tmpl/default_results.php + views/jmnogosearch/tmpl/index.html diff --git a/com_jmnogosearch/site/controller.php b/com_jmnogosearch/site/controller.php index e2de408..77f5a74 100644 --- a/com_jmnogosearch/site/controller.php +++ b/com_jmnogosearch/site/controller.php @@ -1,10 +1,10 @@ ','<','\\'); $searchword = trim(str_replace($badchars, '', JRequest::getString('searchword', null, 'post'))); // if searchword enclosed in double quotes, strip quotes and do exact match - if (substr($searchword,0,1) == '"' && substr($searchword, -1) == '"') { + if (substr($searchword, 0, 1) == '"' && substr($searchword, -1) == '"') { $post['searchword'] = substr($searchword,1,-1); JRequest::setVar('searchphrase', 'exact'); } else { $post['searchword'] = $searchword; } - $post['ordering'] = JRequest::getWord('ordering', null, 'post'); - $post['searchphrase'] = JRequest::getWord('searchphrase', 'all', 'post'); - $post['limit'] = JRequest::getInt('limit', null, 'post'); - if($post['limit'] === null) unset($post['limit']); + $post['ordering'] = JRequest::getWord('ordering', null, 'post'); + $post['searchphrase'] = JRequest::getWord('searchphrase', 'all', 'post'); + $post['limit'] = JRequest::getInt('limit', null, 'post'); + if ($post['limit'] === null) unset($post['limit']); $areas = JRequest::getVar('areas', null, 'post', 'array'); if ($areas) { @@ -65,9 +65,9 @@ class mnoGoSearchController extends JController // set Itemid id for links from menu $menu = &JSite::getMenu(); - $items = $menu->getItems('link', 'index.php?option=com_mnogosearch&view=search'); + $items = $menu->getItems('link', 'index.php?option=com_jmnogosearch&view=jmnogosearch'); - if(isset($items[0])) { + if (isset($items[0])) { $post['Itemid'] = $items[0]->id; } else if (JRequest::getInt('Itemid') > 0) { //use Itemid from requesting page only if there is no existing menu $post['Itemid'] = JRequest::getInt('Itemid'); @@ -78,8 +78,7 @@ class mnoGoSearchController extends JController $uri = JURI::getInstance(); $uri->setQuery($post); - $uri->setVar('option', 'com_mnogosearch'); - + $uri->setVar('option', 'com_jmnogosearch'); $this->setRedirect(JRoute::_('index.php'.$uri->toString(array('query', 'fragment')), false)); } diff --git a/com_jmnogosearch/site/jmnogosearch.php b/com_jmnogosearch/site/jmnogosearch.php index d7541fb..82214fd 100644 --- a/com_jmnogosearch/site/jmnogosearch.php +++ b/com_jmnogosearch/site/jmnogosearch.php @@ -1,10 +1,10 @@ execute(JRequest::getCmd('task')); diff --git a/com_jmnogosearch/site/models/jmnogosearch.php b/com_jmnogosearch/site/models/jmnogosearch.php index a29b56e..bb74495 100644 --- a/com_jmnogosearch/site/models/jmnogosearch.php +++ b/com_jmnogosearch/site/models/jmnogosearch.php @@ -1,10 +1,10 @@ setState('limitstart', JRequest::getVar('limitstart', 0, '', 'int')); // Set the search parameters - $keyword = urldecode(JRequest::getString('searchword')); - $match = JRequest::getWord('searchphrase', 'all'); - $ordering = JRequest::getWord('ordering', 'newest'); + $keyword = urldecode(JRequest::getString('searchword')); + $match = JRequest::getWord('searchphrase', 'all'); + $ordering = JRequest::getWord('ordering', 'newest'); $this->setSearch($keyword, $match, $ordering); - - //Set the search areas - $areas = JRequest::getVar('areas'); - $this->setAreas($areas); } /** @@ -105,19 +94,6 @@ class mnoGoSearchModelSearch extends JModel } } - /** - * Method to set the search areas - * - * @access public - * @param array Active areas - * @param array Search areas - */ - function setAreas($active = array(), $search = array()) - { - $this->_areas['active'] = $active; - $this->_areas['search'] = $search; - } - /** * Method to get weblink item data for the category * @@ -129,7 +105,10 @@ class mnoGoSearchModelSearch extends JModel // Lets load the content if it doesn't already exist if (empty($this->_data)) { - $areas = $this->getAreas(); + /* 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(); @@ -144,19 +123,22 @@ class mnoGoSearchModelSearch extends JModel $rows = array_merge( (array) $rows, (array) $result); } - $this->_total = count($rows); + $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->_data = array_splice($rows, $this->getState('limitstart'), $this->getState('limit')); } else { $this->_data = $rows; } + + udm_free_res ($mResult); + udm_free_agent ($agent); } return $this->_data; } /** - * Method to get the total number of weblink items for the category + * Method to get the total number of weblink items * * @access public * @return integer @@ -183,32 +165,4 @@ class mnoGoSearchModelSearch extends JModel return $this->_pagination; } - - /** - * Method to get the search areas - * - * @since 1.5 - */ - function getAreas() - { - global $mainframe; - - // Load the Category data - if (empty($this->_areas['search'])) - { - $areas = array(); - - JPluginHelper::importPlugin( 'search'); - $dispatcher =& JDispatcher::getInstance(); - $searchareas = $dispatcher->trigger( 'onSearchAreas' ); - - foreach ($searchareas as $area) { - $areas = array_merge( $areas, $area ); - } - - $this->_areas['search'] = $areas; - } - - return $this->_areas; - } } diff --git a/com_jmnogosearch/site/router.php b/com_jmnogosearch/site/router.php index aed9b53..46b9f83 100644 --- a/com_jmnogosearch/site/router.php +++ b/com_jmnogosearch/site/router.php @@ -1,10 +1,10 @@ Search STANDARD SEARCH LAYOUT DESC - - - - - \ No newline at end of file + diff --git a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php index 9659ede..7a53507 100644 --- a/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php +++ b/com_jmnogosearch/site/views/jmnogosearch/tmpl/default_form.php @@ -1,6 +1,6 @@ -
+
@@ -29,18 +29,6 @@
- params->get( 'search_areas', 1 )) : ?> - : - searchareas['search'] as $val => $txt) : - $checked = is_array( $this->searchareas['active'] ) && in_array( $val, $this->searchareas['active'] ) ? 'checked="checked"' : ''; - ?> - /> - - - - @@ -72,5 +60,5 @@ - + diff --git a/com_jmnogosearch/site/views/jmnogosearch/view.html.php b/com_jmnogosearch/site/views/jmnogosearch/view.html.php index f0f2cef..2b8280e 100644 --- a/com_jmnogosearch/site/views/jmnogosearch/view.html.php +++ b/com_jmnogosearch/site/views/jmnogosearch/view.html.php @@ -1,10 +1,10 @@ getPathway(); - $uri =& JFactory::getURI(); + $pathway =& $mainframe->getPathway(); + $uri =& JFactory::getURI(); - $error = ''; - $rows = null; - $total = 0; + $error = ''; + $rows = null; + $total = 0; // Get some data from the model - $areas = &$this->get('areas'); - $state = &$this->get('state'); + $state = &$this->get('state'); $searchword = $state->get('keyword'); $params = &$mainframe->getParams(); - $menus = &JSite::getMenu(); - $menu = $menus->getActive(); + $menus = &JSite::getMenu(); + $menu = $menus->getActive(); // because the application sets a default page title, we need to get it // right from the menu item itself @@ -59,7 +58,7 @@ class JMnoGoSearchViewJMnoGoSearch extends JView $params->set('page_title', JText::_( 'Search' )); } - $document = &JFactory::getDocument(); + $document = &JFactory::getDocument(); $document->setTitle( $params->get( 'page_title' ) ); // Get the parameters of the active menu item @@ -67,32 +66,31 @@ class JMnoGoSearchViewJMnoGoSearch extends JView // built select lists $orders = array(); - $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', 'category', JText::_( 'Section/Category' ) ); + $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' ) ); $lists = array(); $lists['ordering'] = JHTML::_('select.genericlist', $orders, 'ordering', 'class="inputbox"', 'value', 'text', $state->get('ordering') ); - $searchphrases = array(); - $searchphrases[] = JHTML::_('select.option', 'all', JText::_( 'All words' ) ); - $searchphrases[] = JHTML::_('select.option', 'any', JText::_( 'Any words' ) ); - $searchphrases[] = JHTML::_('select.option', 'exact', JText::_( 'Exact phrase' ) ); - $lists['searchphrase' ]= JHTML::_('select.radiolist', $searchphrases, 'searchphrase', '', 'value', 'text', $state->get('match') ); + $searchphrases = array(); + $searchphrases[] = JHTML::_('select.option', 'all', JText::_( 'All words' ) ); + $searchphrases[] = JHTML::_('select.option', 'any', JText::_( 'Any words' ) ); + $searchphrases[] = JHTML::_('select.option', 'exact', JText::_( 'Exact phrase' ) ); + $lists['searchphrase' ]= JHTML::_('select.radiolist', $searchphrases, 'searchphrase', '', 'value', 'text', $state->get('match') ); // log the search - SearchHelper::logSearch( $searchword); + JMnoGoSearchHelper::logSearch($searchword); //limit searchword - if(SearchHelper::limitSearchWord($searchword)) { + if (JMnoGoSearchHelper::limitSearchWord($searchword)) { $error = JText::_( 'SEARCH_MESSAGE' ); } //sanatise searchword - if(SearchHelper::santiseSearchWord($searchword, $state->get('match'))) { + if (JMnoGoSearchHelper::santiseSearchWord($searchword, $state->get('match'))) { $error = JText::_( 'IGNOREKEYWORD' ); } @@ -106,9 +104,9 @@ class JMnoGoSearchViewJMnoGoSearch extends JView if(!$error) { - $results = &$this->get('data' ); - $total = &$this->get('total'); - $pagination = &$this->get('pagination'); + $results = &$this->get('data'); + $total = &$this->get('total'); + $pagination = &$this->get('pagination'); require_once (JPATH_SITE.DS.'components'.DS.'com_content'.DS.'helpers'.DS.'route.php'); @@ -127,7 +125,7 @@ class JMnoGoSearchViewJMnoGoSearch extends JView $needle = $searchwords[0]; } - $row = SearchHelper::prepareSearchContent( $row, 200, $needle ); + $row = JMnoGoSearchHelper::prepareSearchContent( $row, 200, $needle ); $searchwords = array_unique( $searchwords ); $searchRegex = '#('; $x = 0; @@ -149,26 +147,25 @@ class JMnoGoSearchViewJMnoGoSearch extends JView $created = ''; } - $result->created = $created; - $result->count = $i + 1; + $result->created = $created; + $result->count = $i + 1; } } - $this->result = JText::sprintf( 'TOTALRESULTSFOUND', $total ); + $this->result = JText::sprintf( 'TOTALRESULTSFOUND', $total ); - $this->assignRef('pagination', $pagination); - $this->assignRef('results', $results); - $this->assignRef('lists', $lists); - $this->assignRef('params', $params); + $this->assignRef('pagination', $pagination); + $this->assignRef('results', $results); + $this->assignRef('lists', $lists); + $this->assignRef('params', $params); - $this->assign('ordering', $state->get('ordering')); - $this->assign('searchword', $searchword); - $this->assign('searchphrase', $state->get('match')); - $this->assign('searchareas', $areas); + $this->assign('ordering', $state->get('ordering')); + $this->assign('searchword', $searchword); + $this->assign('searchphrase', $state->get('match')); - $this->assign('total', $total); - $this->assign('error', $error); - $this->assign('action', $uri->toString()); + $this->assign('total', $total); + $this->assign('error', $error); + $this->assign('action', $uri->toString()); parent::display($tpl); } diff --git a/mod_jmnogosearch/helper.php b/mod_jmnogosearch/helper.php index 7a0c9f4..d2569f1 100644 --- a/mod_jmnogosearch/helper.php +++ b/mod_jmnogosearch/helper.php @@ -1,10 +1,10 @@ get('set_itemid', 0)); $moduleclass_sfx = $params->get('moduleclass_sfx', ''); if ($imagebutton) { - $img = modMnoGoSearchHelper::getSearchImage( $button_text ); + $img = modJMnoGoSearchHelper::getSearchImage( $button_text ); } $mitemid = $set_Itemid > 0 ? $set_Itemid : JRequest::getInt('Itemid'); -require(JModuleHelper::getLayoutPath('mod_mnogosearch')); +require(JModuleHelper::getLayoutPath('mod_jmnogosearch')); diff --git a/mod_jmnogosearch/tmpl/default.php b/mod_jmnogosearch/tmpl/default.php index 12cc23a..e29323a 100644 --- a/mod_jmnogosearch/tmpl/default.php +++ b/mod_jmnogosearch/tmpl/default.php @@ -3,7 +3,7 @@ defined('_JEXEC') or die('Restricted access'); ?>
'; + $output = ''; if ($button) : if ($imagebutton) : @@ -37,8 +37,8 @@ defined('_JEXEC') or die('Restricted access'); ?> echo $output; ?> - - + + />
-- 2.49.0