From 7aed9239088b582a065da3fb63796ff66cd357c8 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 26 May 2009 05:28:59 +0000 Subject: Restructure the module lifecycle. Install: _installer::install() is called, any necessary tables are created. Activate: _installer::activate() is called. Module controllers are routable, helpers are accessible, etc. The module is in use. Deactivate: _installer::deactivate() is called. Module code is not accessible or routable. Module is *not* in use, but its tables are still around. Uninstall: _installer::uninstall() is called. Module is completely removed from the database. Admin > Modules will install and activate modules, but will only deactivate (will NOT uninstall modules). --- modules/search/helpers/search.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'modules/search/helpers/search.php') diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php index 2c7be123..15efa3b2 100644 --- a/modules/search/helpers/search.php +++ b/modules/search/helpers/search.php @@ -67,8 +67,8 @@ class search_Core { $record->item_id = $item->id; } - foreach (module::installed() as $module_name => $module_info) { - $class_name = "{$module_name}_search"; + foreach (module::active() as $module) { + $class_name = "{$module->name}_search"; if (method_exists($class_name, "item_index_data")) { $data[] = call_user_func(array($class_name, "item_index_data"), $record->item()); } @@ -83,12 +83,16 @@ class search_Core { ->select("items.id") ->from("items") ->join("search_records", "items.id", "search_records.item_id", "left") + ->open_paren() ->where("search_records.item_id", null) ->orwhere("search_records.dirty", 1) + ->close_paren() ->get() ->count(); + $total = ORM::factory("item")->count_all(); $percent = round(100 * ($total - $remaining) / $total); + return array($remaining, $total, $percent); } } -- cgit v1.2.3