From 11b8ca7953a4da8217fa871dec3da564398ebf4c Mon Sep 17 00:00:00 2001
From: aynsix <asr@esokia-webagency.com>
Date: Mon, 18 May 2020 11:42:06 +0300
Subject: [PATCH] change display work column

---
 .../Phrasea/Model/Entities/WorkerRunningJob.php  | 16 ++++++++++++++++
 .../Worker/WriteMetadatasWorker.php              |  2 +-
 .../admin/worker-manager/worker_info.html.twig   |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Model/Entities/WorkerRunningJob.php b/lib/Alchemy/Phrasea/Model/Entities/WorkerRunningJob.php
index d6f13782f2..8eae6d2313 100644
--- a/lib/Alchemy/Phrasea/Model/Entities/WorkerRunningJob.php
+++ b/lib/Alchemy/Phrasea/Model/Entities/WorkerRunningJob.php
@@ -2,6 +2,7 @@
 
 namespace Alchemy\Phrasea\Model\Entities;
 
+use Alchemy\Phrasea\Core\PhraseaTokens;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
@@ -196,4 +197,19 @@ class WorkerRunningJob
     {
         return $this->status;
     }
+
+    public function getWorkName()
+    {
+        switch ($this->work) {
+            case PhraseaTokens::MAKE_SUBDEF:
+                return 'MAKE_SUBDEF';
+            case PhraseaTokens::WRITE_META_DOC:
+                return 'WRITE_META_DOC';
+            case PhraseaTokens::WRITE_META_SUBDEF:
+                return 'WRITE_META_SUBDEF';
+            default:
+                return $this->work;
+
+        }
+    }
 }
diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/WriteMetadatasWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/WriteMetadatasWorker.php
index fc2c7c7215..d20ccac534 100644
--- a/lib/Alchemy/Phrasea/WorkerManager/Worker/WriteMetadatasWorker.php
+++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/WriteMetadatasWorker.php
@@ -217,7 +217,7 @@ class WriteMetadatasWorker implements WorkerInterface
                     $this->writer->write($subdef->getRealPath(), $metadata);
 
                     $this->messagePublisher->pushLog(sprintf('meta written for sbasid=%1$d - recordid=%2$d (%3$s)', $databox->get_sbas_id(), $recordId, $subdef->get_name() ));
-                } catch (PHPExiftoolException $e) {
+                } catch (\Exception $e) {
                     $workerMessage = sprintf('meta NOT written for sbasid=%1$d - recordid=%2$d (%3$s) because "%s"', $databox->get_sbas_id(), $recordId, $subdef->get_name() , $e->getMessage());
                     $this->logger->error($workerMessage);
 
diff --git a/templates/web/admin/worker-manager/worker_info.html.twig b/templates/web/admin/worker-manager/worker_info.html.twig
index 402192c0f9..d5fa01d1d5 100644
--- a/templates/web/admin/worker-manager/worker_info.html.twig
+++ b/templates/web/admin/worker-manager/worker_info.html.twig
@@ -37,7 +37,7 @@
     <tr>
         <td>{{ workerRow.databoxId }}</td>
         <td>{{ workerRow.recordId }}</td>
-        <td>{{ workerRow.work }}</td>
+        <td>{{ workerRow.getWorkName }}</td>
         <td>{{ workerRow.workOn }}</td>
         <td>{{ workerRow.created|date('Y-m-d H:i:s') }}</td>
         <td>{{ workerRow.published|date('Y-m-d H:i:s') }}</td>