From 22840da6c7a4c0c35cb9739573f03084d77c86ad Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 31 Aug 2018 18:07:44 +0000 Subject: [PATCH] --- server/AyaNova/biz/ImportAyaNova7Biz.cs | 30 ++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/biz/ImportAyaNova7Biz.cs b/server/AyaNova/biz/ImportAyaNova7Biz.cs index ab1ca98b..ebd4d3f6 100644 --- a/server/AyaNova/biz/ImportAyaNova7Biz.cs +++ b/server/AyaNova/biz/ImportAyaNova7Biz.cs @@ -176,7 +176,15 @@ namespace AyaNova.Biz long notImportCount = 0; if (zipObjectList.Count > 0) { - JobsBiz.LogJob(jobId, $"Starting import of {entryStartsWith} objects", ct); + if (importTask != "main") + { + JobsBiz.LogJob(jobId, $"Starting import sub-task {importTask} of {entryStartsWith} objects", ct); + } + else + { + JobsBiz.LogJob(jobId, $"Starting import of {entryStartsWith} objects", ct); + } + var jList = FileUtil.ZipGetUtilityArchiveEntriesAsJsonObjects(zipObjectList, importFileName); IImportAyaNova7Object o = (IImportAyaNova7Object)BizObjectFactory.GetBizObject(importerType, ct); @@ -198,15 +206,27 @@ namespace AyaNova.Biz if (importCount > 0) { - JobsBiz.LogJob(jobId, $"Successfully imported {importCount.ToString()} of {zipObjectList.Count.ToString()} {entryStartsWith} objects", ct); + if (importTask != "main") + { + JobsBiz.LogJob(jobId, $"Successfully ran import subtask {importTask} on {importCount.ToString()} of {zipObjectList.Count.ToString()} {entryStartsWith} objects", ct); + } + else + { + JobsBiz.LogJob(jobId, $"Successfully imported {importCount.ToString()} of {zipObjectList.Count.ToString()} {entryStartsWith} objects", ct); + } } if (notImportCount > 0) { - JobsBiz.LogJob(jobId, $"Did not import {notImportCount.ToString()} of {zipObjectList.Count.ToString()} {entryStartsWith} objects", ct); + if (importTask != "main") + { + JobsBiz.LogJob(jobId, $"Failed to run import subtask {importTask} on {notImportCount.ToString()} of {zipObjectList.Count.ToString()} {entryStartsWith} objects", ct); + } + else + { + JobsBiz.LogJob(jobId, $"Did not import {notImportCount.ToString()} of {zipObjectList.Count.ToString()} {entryStartsWith} objects", ct); + } } - - } }