Revert "Add task logging to the "Update Search Index" task"

This reverts commit 6ac5238b83d58824eb9327406a2ee50b7e603214.

2 files changed, 24 insertions, 36 deletions

diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 34eaecbd..ea8dad81 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -50,9 +50,6 @@ class search_Core {
     return array($count, new ORM_Iterator(ORM::factory("item"), $db->query($query)));
   }
 
-  /**
-   * @return string An error message suitable for inclusion in the task log
-   */
   static function check_index() {
     list ($remaining) = search::stats();
     if ($remaining) {
@@ -79,7 +76,6 @@ class search_Core {
     $record->data = join(" ", $data);
     $record->dirty = 0;
     $record->save();
-    return t("Search index updated for '%title'", array("title" => p::purify($item->title)));
   }
 
   static function stats() {
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 395bcd98..876661e4 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -39,42 +39,34 @@ class search_task_Core {
   }
 
   static function update_index($task) {
-    try {
-      $completed = $task->get("completed", 0);
+    $completed = $task->get("completed", 0);
 
-      $start = microtime(true);
-      foreach (ORM::factory("item")
-               ->join("search_records", "items.id", "search_records.item_id", "left")
-               ->where("search_records.item_id", null)
-               ->orwhere("search_records.dirty", 1)
-               ->find_all() as $item) {
-        if (microtime(true) - $start > 1.5) {
-          break;
-        }
-
-        $message[] = search::update($item);
-        $completed++;
+    $start = microtime(true);
+    foreach (ORM::factory("item")
+             ->join("search_records", "items.id", "search_records.item_id", "left")
+             ->where("search_records.item_id", null)
+             ->orwhere("search_records.dirty", 1)
+             ->find_all() as $item) {
+      if (microtime(true) - $start > 1.5) {
+        break;
       }
 
-      list ($remaining, $total, $percent) = search::stats();
-      $task->set("completed", $completed);
-      if ($remaining == 0 || !($remaining + $completed)) {
-        $task->done = true;
-        $task->state = "success";
-        site_status::clear("search_index_out_of_date");
-        $task->percent_complete = 100;
-      } else {
-        $task->percent_complete = round(100 * $completed / ($remaining + $completed));
-      }
-      $task->status = t2("one record updated, index is %percent% up-to-date",
-                         "%count records updated, index is %percent% up-to-date",
-                         $completed, array("percent" => $percent));
-    } catch (Exception $e) {
+      search::update($item);
+      $completed++;
+    }
+
+    list ($remaining, $total, $percent) = search::stats();
+    $task->set("completed", $completed);
+    if ($remaining == 0 || !($remaining + $completed)) {
       $task->done = true;
-      $task->state = "error";
-      $task->status = $e->getMessage();
-      $message[] = $e->__toString();
+      $task->state = "success";
+      site_status::clear("search_index_out_of_date");
+      $task->percent_complete = 100;
+    } else {
+      $task->percent_complete = round(100 * $completed / ($remaining + $completed));
     }
-    $task->log($message);
+    $task->status = t2("one record updated, index is %percent% up-to-date",
+                       "%count records updated, index is %percent% up-to-date",
+                       $completed, array("percent" => $percent));
   }
 }