diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/elgglib.php | 4 | ||||
| -rw-r--r-- | engine/lib/entities.php | 34 | ||||
| -rw-r--r-- | engine/lib/search.php | 50 | ||||
| -rw-r--r-- | engine/schema/upgrades/2009093001.sql | 11 |
4 files changed, 52 insertions, 47 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index b2a157155..fc87c1dc1 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -719,7 +719,7 @@ $context = get_context(); - $html = elgg_view('entities/entity_list',array( + $html = elgg_view('search/entity_list',array( 'entities' => $entities, 'count' => $count, 'offset' => $offset, @@ -1000,7 +1000,7 @@ * @return string The HTML (etc) representing the listing */ function elgg_view_listing($icon, $info) { - return elgg_view('entities/entity_listing',array('icon' => $icon, 'info' => $info)); + return elgg_view('search/listing',array('icon' => $icon, 'info' => $info)); } /** diff --git a/engine/lib/entities.php b/engine/lib/entities.php index 55a675154..b72eb6ff0 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -63,13 +63,6 @@ */ protected $temp_annotations; - - /** - * Volatile data structure for this object, allows for storage of data - * in-memory that isn't sync'd back to the metadata table. - */ - protected $volatile; - /** * Initialise the attributes array. * This is vital to distinguish between metadata and base parameters. @@ -86,7 +79,6 @@ if (!is_array($this->attributes)) $this->attributes = array(); if (!is_array($this->temp_metadata)) $this->temp_metadata = array(); if (!is_array($this->temp_annotations)) $this->temp_annotations = array(); - if (!is_array($this->volatile)) $this->volatile = array(); $this->attributes['guid'] = ""; $this->attributes['type'] = ""; @@ -182,31 +174,6 @@ return true; } - - /** - * Get a piece of volatile (non-persisted) data on this entity - */ - public function getVolatileData($name) { - if (!is_array($this->volatile)) $this->volatile = array(); - - if (array_key_exists($name, $this->volatile)) { - return $this->volatile[$name]; - } else { - return NULL; - } - } - - - /** - * Get a piece of volatile (non-persisted) data on this entity - */ - public function setVolatileData($name, $value) { - if (!is_array($this->volatile)) $this->volatile = array(); - - $this->volatile[$name] = $value; - } - - /** * Get a given piece of metadata. * @@ -719,7 +686,6 @@ { // Create the array if necessary - all subclasses should test before creating if (!is_array($this->attributes)) $this->attributes = array(); - if (!is_array($this->volatile)) $this->volatile = array(); // Now put these into the attributes array as core values $objarray = (array) $row; diff --git a/engine/lib/search.php b/engine/lib/search.php new file mode 100644 index 000000000..222c0b6e9 --- /dev/null +++ b/engine/lib/search.php @@ -0,0 +1,50 @@ +<?php + /** + * Elgg search helper functions. + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd <info@elgg.com> + * @link http://elgg.org/ + */ + + /** + * Initialise search helper functions. + * + */ + function search_init() + { + register_page_handler('search','search_page_handler'); + } + + /** + * Page handler for search + * + * @param array $page Page elements from pain page handler + */ + function search_page_handler($page) + { + global $CONFIG; + + if(!get_input('tag')) { + set_input('tag', $page[0]); + } + + if (isset($page[0])) { + switch ($page[0]) { + case 'user' : + case 'users' : include_once($CONFIG->path . "search/users.php"); break; + + case 'group' : + case 'groups' : include_once($CONFIG->path . "search/groups.php"); break; + + default: include_once($CONFIG->path . "search/index.php"); + } + } + else + include_once($CONFIG->path . "search/index.php"); + } + + /** Register init system event **/ + register_elgg_event_handler('init','system','search_init'); +?> diff --git a/engine/schema/upgrades/2009093001.sql b/engine/schema/upgrades/2009093001.sql deleted file mode 100644 index ce7bf96e4..000000000 --- a/engine/schema/upgrades/2009093001.sql +++ /dev/null @@ -1,11 +0,0 @@ ---Search Index -CREATE TABLE IF NOT EXISTS `prefix_search_index`( - `guid` INT NOT NULL, - `subtype` VARCHAR( 32 ) NOT NULL, - `string` TEXT NOT NULL, - PRIMARY KEY (`guid`,`subtype`), - KEY `guid` (`guid`), - KEY `subtype` (`subtype`), - FULLTEXT KEY `string` (`string`) -) ENGINE = MYISAM DEFAULT CHARSET=utf8; - |