From: Karl O. Pinc <kop@karlpinc.com>
Date: Tue, 16 Jul 2024 22:14:31 +0000 (-0500)
Subject: Move core utility functions into a separate module
X-Git-Url: https://papio.biology.duke.edu/gitweb/?a=commitdiff_plain;h=d341e06f0dcaccc93696344b77fa216302abdbf4;p=pgwui_bulk_upload

Move core utility functions into a separate module
---

diff --git a/src/pgwui_bulk_upload/views/bulk_upload.py b/src/pgwui_bulk_upload/views/bulk_upload.py
index 929cbdb..9269330 100644
--- a/src/pgwui_bulk_upload/views/bulk_upload.py
+++ b/src/pgwui_bulk_upload/views/bulk_upload.py
@@ -32,6 +32,7 @@ import yaml
 
 from pgwui_common.view import auth_base_view
 import pgwui_core.exceptions as core_ex
+import pgwui_core.utils
 
 from pgwui_core.core import (
     UploadNullFileWTForm,
@@ -41,8 +42,6 @@ from pgwui_core.core import (
     UploadNullMixin,
     UploadDoubleFileForm,
     UploadData,
-    escape_eol,
-    is_checked,
 )
 from pgwui_upload_core.views.upload import (
     BaseTableUploadHandler,
@@ -678,7 +677,7 @@ def relation_stats(stats, quote_columns):
 
 
 def log_success(response, stats, i_rows, r_stats):
-    if is_checked(response['csv_checked']):
+    if pgwui_core.utils.is_checked(response['csv_checked']):
         upload_fmt = 'CSV'
     else:
         upload_fmt = 'TAB'
@@ -697,9 +696,11 @@ def log_success(response, stats, i_rows, r_stats):
         msg.append(
             f'Uploaded the {lines} lines of file ({path}) into ({relation}): ')
     msg.append(f'Format {upload_fmt}: '
-               f"Upload Null {is_checked(response['upload_null'])}: "
-               f"Null Rep ({escape_eol(response['null_rep'])}): "
-               f"Trim {is_checked(response['trim_upload'])}: "
+               'Upload Null '
+               f"{pgwui_core.utils.is_checked(response['upload_null'])}: "
+               f'Null Rep '
+               f"({pgwui_core.utils.escape_eol(response['null_rep'])}): "
+               f"Trim {pgwui_core.utils.is_checked(response['trim_upload'])}: "
                f"By user {response['user']}")
 
     log.info(''.join(msg))