From 3a177ae18c5585bd54984f793cf8156811fc73f8 Mon Sep 17 00:00:00 2001 From: yuusuke_kanamura Date: Fri, 16 Sep 2022 09:26:33 +0900 Subject: [PATCH] =?UTF-8?q?feat:=E4=B8=8B=E7=94=B0=E3=81=95=E3=82=93?= =?UTF-8?q?=E3=81=AE=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E6=8C=87=E6=91=98?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/dataimport/dataimport/chk.py | 8 ++++---- ecs/dataimport/dataimport/common.py | 1 - ecs/dataimport/dataimport/main.py | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ecs/dataimport/dataimport/chk.py b/ecs/dataimport/dataimport/chk.py index d3d8801c..125dbb2a 100644 --- a/ecs/dataimport/dataimport/chk.py +++ b/ecs/dataimport/dataimport/chk.py @@ -5,8 +5,7 @@ import csv import sys from end import end from error import error -from common import debug_log -from common import convert_quotechar +from common import debug_log, convert_quotechar # 定数 DIRECTORY_WORK = '/work/' @@ -83,12 +82,13 @@ def check(bucket_name, target_data_source, target_file_name, settings_key, log_i work_obj = s3_resource.Object(bucket_name, work_key) work_response = work_obj.get() work_data = io.TextIOWrapper(io.BytesIO(work_response["Body"].read()), encoding=settings_list[SETTINGS_ITEM["charCode"]], newline=LINE_FEED_CODE[settings_list[SETTINGS_ITEM["lineFeedCode"]]]) - work_header_list = [] + work_header_list = [] + # ヘッダ行のみのファイルは、0バイトファイル同等とみなす for i, line in enumerate(csv.reader(work_data, quotechar=convert_quotechar(settings_list[SETTINGS_ITEM["quotechar"]]), delimiter=settings_list[SETTINGS_ITEM["delimiter"]])): if int(settings_list[SETTINGS_ITEM["headerFlag"]]) == True and i == 0: work_header_list = line continue - + break # ② C-0のデータ件数チェックを開始する diff --git a/ecs/dataimport/dataimport/common.py b/ecs/dataimport/dataimport/common.py index 946defe4..1361ff53 100644 --- a/ecs/dataimport/dataimport/common.py +++ b/ecs/dataimport/dataimport/common.py @@ -1,6 +1,5 @@ from datetime import datetime - # 定数 LOG_LEVEL = {"d": 'Debug'} MODE_TYPE = { diff --git a/ecs/dataimport/dataimport/main.py b/ecs/dataimport/dataimport/main.py index c0894209..23932c6f 100644 --- a/ecs/dataimport/dataimport/main.py +++ b/ecs/dataimport/dataimport/main.py @@ -6,8 +6,7 @@ from pymysql.constants import CLIENT import io import csv from error import error -from common import debug_log -from common import convert_quotechar +from common import debug_log, convert_quotechar # 定数 DIRECTORY_WORK = '/work/'