From 31969a1d8211187e415eac51d155b4efded365f3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 7 Jul 2009 12:09:55 -0700
Subject: Forgot this when i was cleaning up for ticket #519

---
 modules/search/views/search.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/search')

diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 6a222ef1..68f05688 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -7,7 +7,7 @@
     </legend>
     <ul>
       <li>
-        <label for="q"><?= t("Search the gallery") ?></label>
+        <label for="q"><?= t("Search the Gallery") ?></label>
         <input name="q" id="q" type="text" value="<?= p::clean($q) ?>"/>
       </li>
       <li>
-- 
cgit v1.2.3


From e5cd7052e810d9bbd4a4a53b5519b91b9f9f2245 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 7 Jul 2009 12:25:19 -0700
Subject: Revert "Forgot this when i was cleaning up for ticket #519"

This reverts commit 31969a1d8211187e415eac51d155b4efded365f3.
---
 modules/search/views/search.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/search')

diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 68f05688..6a222ef1 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -7,7 +7,7 @@
     </legend>
     <ul>
       <li>
-        <label for="q"><?= t("Search the Gallery") ?></label>
+        <label for="q"><?= t("Search the gallery") ?></label>
         <input name="q" id="q" type="text" value="<?= p::clean($q) ?>"/>
       </li>
       <li>
-- 
cgit v1.2.3


From 6ac5238b83d58824eb9327406a2ee50b7e603214 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 8 Jul 2009 09:27:37 -0700
Subject: Add task logging to the "Update Search Index" task

---
 modules/gallery/helpers/l10n_client.php |  3 ++
 modules/search/helpers/search.php       |  4 +++
 modules/search/helpers/search_task.php  | 56 +++++++++++++++++++--------------
 3 files changed, 39 insertions(+), 24 deletions(-)

(limited to 'modules/search')

diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 5b14abec..6d4da0eb 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -67,6 +67,9 @@ class l10n_client_Core {
     return true;
   }
 
+  /**
+   * @return an array of messages that will be written to the task log
+   */
   static function fetch_updates() {
     $request->locales = array();
     $request->messages = new stdClass();
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index ea8dad81..34eaecbd 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -50,6 +50,9 @@ 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) {
@@ -76,6 +79,7 @@ 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 876661e4..395bcd98 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -39,34 +39,42 @@ class search_task_Core {
   }
 
   static function update_index($task) {
-    $completed = $task->get("completed", 0);
+    try {
+      $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;
-      }
+      $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;
+        }
 
-      search::update($item);
-      $completed++;
-    }
+        $message[] = search::update($item);
+        $completed++;
+      }
 
-    list ($remaining, $total, $percent) = search::stats();
-    $task->set("completed", $completed);
-    if ($remaining == 0 || !($remaining + $completed)) {
+      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) {
       $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->state = "error";
+      $task->status = $e->getMessage();
+      $message[] = $e->__toString();
     }
-    $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));
+    $task->log($message);
   }
 }
-- 
cgit v1.2.3