Skip to content
Snippets Groups Projects
Verified Commit 97ebd7f5 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

FIX: Import uses correct name caosadvancedtools

parent 601ab067
Branches
Tags
2 merge requests!147Release 0.15.1,!146Fix zip file export
Pipeline #57995 passed
...@@ -32,7 +32,7 @@ from zipfile import ZipFile ...@@ -32,7 +32,7 @@ from zipfile import ZipFile
import linkahead as db import linkahead as db
import pandas as pd import pandas as pd
from linkaheadadvancedtools.serverside import helper from caosadvancedtools.serverside import helper
from linkahead import LinkAheadException, ConsistencyError, EntityDoesNotExistError from linkahead import LinkAheadException, ConsistencyError, EntityDoesNotExistError
...@@ -81,14 +81,14 @@ def collect_files_in_zip(ids, table): ...@@ -81,14 +81,14 @@ def collect_files_in_zip(ids, table):
# Desired behavior: The script should go on with the other # Desired behavior: The script should go on with the other
# ids, but the user should be informed about the missing files. # ids, but the user should be informed about the missing files.
# How should we do this? # How should we do this?
logger = logging.getLogger("linkaheadadvancedtools") logger = logging.getLogger("caosadvancedtools")
logger.error("Did not find Entity with ID={}.".format( logger.error("Did not find Entity with ID={}.".format(
file_id)) file_id))
raise e raise e
savename = nc.get_unique_savename(os.path.basename(tmp.path)) savename = nc.get_unique_savename(os.path.basename(tmp.path))
val_file = helper.get_file_via_download( val_file = helper.get_file_via_download(
tmp, logger=logging.getLogger("linkaheadadvancedtools")) tmp, logger=logging.getLogger("caosadvancedtools"))
zf.write(val_file, savename) zf.write(val_file, savename)
......
...@@ -35,8 +35,8 @@ from datetime import datetime ...@@ -35,8 +35,8 @@ from datetime import datetime
import linkahead as db import linkahead as db
import pandas as pd import pandas as pd
from linkaheadadvancedtools.serverside.helper import get_argument_parser from caosadvancedtools.serverside.helper import get_argument_parser
from linkaheadadvancedtools.serverside.logging import configure_server_side_logging from caosadvancedtools.serverside.logging import configure_server_side_logging
MAXIMUMFILESIZE = 1e8 MAXIMUMFILESIZE = 1e8
VALID_ENDINGS = [".csv", ".tsv", ".xls", ".xlsx"] VALID_ENDINGS = [".csv", ".tsv", ".xls", ".xlsx"]
...@@ -135,7 +135,7 @@ if __name__ == "__main__": ...@@ -135,7 +135,7 @@ if __name__ == "__main__":
args = parser.parse_args() args = parser.parse_args()
debug_file = configure_server_side_logging() debug_file = configure_server_side_logging()
logger = logging.getLogger("linkaheadadvancedtools") logger = logging.getLogger("caosadvancedtools")
db.configure_connection(auth_token=args.auth_token) db.configure_connection(auth_token=args.auth_token)
entity_id = args.filename entity_id = args.filename
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment