From 43839f6499dee7c81837aefcf8b28a9af45e810b Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 3 Dec 2020 19:06:15 +0100
Subject: [PATCH] FIX #15338 TIME 0:05 total_errors must not be null in
history_batch
---
bin/exportSeda/checkAllReplies.php | 2 +-
bin/exportSeda/purge.php | 4 ++--
bin/signatureBook/process_mailsFromSignatoryBook.php | 2 +-
migration/20.10/2010.sql | 4 +++-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/bin/exportSeda/checkAllReplies.php b/bin/exportSeda/checkAllReplies.php
index 1b5bf7c5093..11fa2782a28 100755
--- a/bin/exportSeda/checkAllReplies.php
+++ b/bin/exportSeda/checkAllReplies.php
@@ -187,7 +187,7 @@ foreach ($unitIdentifiers as $reference => $value) {
Bt_writeLog(['level' => 'INFO', 'message' => 'End of process']);
Bt_writeLog(['level' => 'INFO', 'message' => $nbMailsRetrieved.' document(s) retrieved']);
-Bt_logInDataBase($nbMailsRetrieved, $err, $nbMailsRetrieved.' replie(s) retrieved from archiving system');
+Bt_logInDataBase($nbMailsRetrieved, 0, $nbMailsRetrieved.' replie(s) retrieved from archiving system');
Bt_updateWorkBatch();
exit($GLOBALS['exitCode']);
diff --git a/bin/exportSeda/purge.php b/bin/exportSeda/purge.php
index bfd4ddaa9d7..9ef74c2d9f9 100755
--- a/bin/exportSeda/purge.php
+++ b/bin/exportSeda/purge.php
@@ -214,11 +214,11 @@ $nbMailsPurge = count($resources);
Bt_writeLog(['level' => 'INFO', 'message' => $nbMailsPurge.' document(s) retrieved']);
if ($nbMailsPurge == 0) {
- Bt_logInDataBase($nbMailsPurge, $err, $nbMailsPurge.' mail(s) purge');
+ Bt_logInDataBase($nbMailsPurge, 0, $nbMailsPurge.' mail(s) purge');
} else {
$resources = array_chunk($resources, 100);
foreach ($resources as $chunk) {
- Bt_logInDataBase($nbMailsPurge, $err, $nbMailsPurge.' mail(s) purge : ' . implode(", ", $chunk));
+ Bt_logInDataBase($nbMailsPurge, 0, $nbMailsPurge.' mail(s) purge : ' . implode(", ", $chunk));
}
}
Bt_updateWorkBatch();
diff --git a/bin/signatureBook/process_mailsFromSignatoryBook.php b/bin/signatureBook/process_mailsFromSignatoryBook.php
index b127b643f69..a7311e946c4 100755
--- a/bin/signatureBook/process_mailsFromSignatoryBook.php
+++ b/bin/signatureBook/process_mailsFromSignatoryBook.php
@@ -409,7 +409,7 @@ foreach ($retrievedMails['resLetterbox'] as $resId => $value) {
Bt_writeLog(['level' => 'INFO', 'message' => 'End of process']);
Bt_writeLog(['level' => 'INFO', 'message' => $nbMailsRetrieved.' document(s) retrieved']);
-Bt_logInDataBase($nbMailsRetrieved, $err, $nbMailsRetrieved.' mail(s) retrieved from signatory book');
+Bt_logInDataBase($nbMailsRetrieved, 0, $nbMailsRetrieved.' mail(s) retrieved from signatory book');
Bt_updateWorkBatch();
exit($GLOBALS['exitCode']);
diff --git a/migration/20.10/2010.sql b/migration/20.10/2010.sql
index feae535ec59..3f657347e4a 100755
--- a/migration/20.10/2010.sql
+++ b/migration/20.10/2010.sql
@@ -5,7 +5,7 @@
-- --
-- --
-- *************************************************************************--
-UPDATE parameters SET param_value_string = '20.10.1' WHERE id = 'database_version';
+UPDATE parameters SET param_value_string = '20.10.2' WHERE id = 'database_version';
DROP VIEW IF EXISTS res_view_letterbox;
@@ -358,6 +358,8 @@ INSERT INTO parameters (id, description, param_value_int) VALUES ('minimumVisaRo
DELETE FROM parameters WHERE id = 'maximumSignRole';
INSERT INTO parameters (id, description, param_value_int) VALUES ('maximumSignRole', 'Nombre maximum de signataires dans les circuits de visa (0 pour désactiver)', 0);
+UPDATE history_batch SET total_errors = 0 WHERE total_errors IS NULL;
+
/* ORDER ON CHRONO */
CREATE OR REPLACE FUNCTION order_alphanum(text) RETURNS text AS $$
declare
--
GitLab