From 5588b1859576bae725e69d23a2f3f4f34eb13979 Mon Sep 17 00:00:00 2001 From: Damien <damien.burel@maarch.org> Date: Fri, 17 May 2019 15:00:15 +0200 Subject: [PATCH] FEAT #10525 TIME 0:20 Rest full text --- .../attachment/controllers/AttachmentController.php | 13 +++++++++++++ src/app/resource/controllers/ResController.php | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php index d5c8431de51..c46cd69ddfd 100755 --- a/src/app/attachment/controllers/AttachmentController.php +++ b/src/app/attachment/controllers/AttachmentController.php @@ -36,6 +36,7 @@ use SrcCore\models\CoreConfigModel; use SrcCore\models\DatabaseModel; use SrcCore\models\ValidatorModel; use Template\controllers\TemplateController; +use User\models\UserModel; class AttachmentController { @@ -101,6 +102,18 @@ class AttachmentController return $response->withStatus(500)->withJson(['errors' => '[AttachmentController create] ' . $resId['errors']]); } + $collId = empty($body['version']) ? 'attachments_coll' : 'attachments_version_coll'; + ConvertPdfController::convert([ + 'resId' => $resId, + 'collId' => $collId, + 'isVersion' => !empty($body['version']) + ]); + + $customId = CoreConfigModel::getCustomId(); + $customId = empty($customId) ? 'null' : $customId; + $user = UserModel::getByLogin(['select' => ['id'], 'login' => $GLOBALS['userId']]); + exec("php src/app/convert/scripts/FullTextScript.php {$customId} {$resId} {$collId} {$user['id']} > /dev/null &"); + HistoryController::add([ 'tableName' => $body['table'], 'recordId' => $resId, diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index 977ab79f1f3..8c324eab325 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -78,6 +78,17 @@ class ResController return $response->withStatus(500)->withJson(['errors' => '[ResController create] ' . $resId['errors']]); } + ConvertPdfController::convert([ + 'resId' => $resId, + 'collId' => 'letterbox_coll', + 'isVersion' => false + ]); + + $customId = CoreConfigModel::getCustomId(); + $customId = empty($customId) ? 'null' : $customId; + $user = UserModel::getByLogin(['select' => ['id'], 'login' => $GLOBALS['userId']]); + exec("php src/app/convert/scripts/FullTextScript.php {$customId} {$resId} 'letterbox_coll' {$user['id']} > /dev/null &"); + HistoryController::add([ 'tableName' => 'res_letterbox', 'recordId' => $resId, -- GitLab