From bad6d215846cb115c88be0dae0039e89318b21b1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 19 Jul 2009 13:48:38 -0700
Subject: Remove success logging from exif_task.

---
 modules/exif/helpers/exif_task.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'modules/exif/helpers/exif_task.php')

diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index f3e77975..c269b732 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -42,7 +42,6 @@ class exif_task_Core {
       $completed = $task->get("completed", 0);
 
       $start = microtime(true);
-      $message = array();
       foreach (ORM::factory("item")
                ->join("exif_records", "items.id", "exif_records.item_id", "left")
                ->where("type", "photo")
@@ -57,11 +56,8 @@ class exif_task_Core {
 
         $completed++;
         exif::extract($item);
-        $message[] = t("Updated Exif meta data for '%title'",
-                       array("title" => p::purify($item->title)));
       }
 
-      $task->log($message);
       list ($remaining, $total, $percent) = exif::stats();
       $task->set("completed", $completed);
       if ($remaining == 0 || !($remaining + $completed)) {
-- 
cgit v1.2.3


From af6bfa3c71ccc2d45d3029c96f934a7ecd2c2143 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 13:29:05 -0700
Subject: Change the processing time for search_task and exif_task to start the
 1.5 second counter only after we've done any expensive queries.  This
 guarantees at least some time to do work.

Fixes ticket #693.
---
 modules/exif/helpers/exif_task.php     | 12 +++++++++---
 modules/search/helpers/search_task.php | 10 ++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'modules/exif/helpers/exif_task.php')

diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index c269b732..7c4c97c4 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -50,12 +50,18 @@ class exif_task_Core {
                ->orwhere("exif_records.dirty", 1)
                ->close_paren()
                ->find_all() as $item) {
-        if (microtime(true) - $start > 1.5) {
-          break;
+        // The query above can take a long time, so start the timer after its done
+        // to give ourselves a little time to actually process rows.
+        if (!isset($start)) {
+          $start = microtime(true);
         }
 
-        $completed++;
         exif::extract($item);
+        $completed++;
+
+        if (microtime(true) - $start > 1.5) {
+          break;
+        }
       }
 
       list ($remaining, $total, $percent) = exif::stats();
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 5643573a..9508f420 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -48,12 +48,18 @@ class search_task_Core {
                ->where("search_records.item_id", null)
                ->orwhere("search_records.dirty", 1)
                ->find_all() as $item) {
-        if (microtime(true) - $start > 1.5) {
-          break;
+        // The query above can take a long time, so start the timer after its done
+        // to give ourselves a little time to actually process rows.
+        if (!isset($start)) {
+          $start = microtime(true);
         }
 
         search::update($item);
         $completed++;
+
+        if (microtime(true) - $start > 1.5) {
+          break;
+        }
       }
 
       list ($remaining, $total, $percent) = search::stats();
-- 
cgit v1.2.3