diff --git a/misc/merge_xsl.sh b/misc/merge_xsl.sh index abf95444de1ca550f5cd66ae1f02e2f0587503f0..e88bf6de7ea7291dbc9baa74bb3a1db0db63134d 100755 --- a/misc/merge_xsl.sh +++ b/misc/merge_xsl.sh @@ -31,7 +31,7 @@ SOURCE_DIR=public/ MERGE="xsl/jsheader.xsl xsl/footer.xsl xsl/filesystem.xsl xsl/entity.xsl xsl/query.xsl xsl/messages.xsl xsl/navbar.xsl xsl/main.xsl xsl/welcome.xsl xsl/common.xsl" -TARGET=public/webcaosdb.xsl +TARGET=public/weblinkahead.xsl function _merge () { diff --git a/src/server_side_scripting/ext_file_download/zip_files.py b/src/server_side_scripting/ext_file_download/zip_files.py index 65f27c9d901a6790456b8addb636bd55b7fe0c7e..53ea1ca3952ef7ec793ae0e53fb851bf1866a39b 100755 --- a/src/server_side_scripting/ext_file_download/zip_files.py +++ b/src/server_side_scripting/ext_file_download/zip_files.py @@ -30,10 +30,10 @@ import sys from tempfile import NamedTemporaryFile from zipfile import ZipFile -import caosdb as db +import linkahead as db import pandas as pd from caosadvancedtools.serverside import helper -from caosdb import CaosDBException, ConsistencyError, EntityDoesNotExistError +from linkahead import LinkAheadException, ConsistencyError, EntityDoesNotExistError def _parse_arguments():