From 407c8ce7e69db85ffe3bacdb52df5ea245741c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Sun, 28 Nov 2021 12:24:35 +0100
Subject: [PATCH] MAINT: call scripts via API
---
.../serverside/generic_analysis.py | 25 +++++++++++--------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/caosadvancedtools/serverside/generic_analysis.py b/src/caosadvancedtools/serverside/generic_analysis.py
index 1d213702..4f1d49fc 100644
--- a/src/caosadvancedtools/serverside/generic_analysis.py
+++ b/src/caosadvancedtools/serverside/generic_analysis.py
@@ -92,6 +92,7 @@ import subprocess
import sys
import caosdb as db
+from caosdb.utils.server_side_scripting import run_server_side_script
logger = logging.getLogger(__name__)
@@ -134,21 +135,23 @@ def check_referenced_script(record: db.Record):
def call_script(script_name, record_id):
- if script_name not in os.listdir("."):
- logger.warning("No script with the name '{}' is installed.".format(
- script_name))
+ ret = run_server_side_script(script_name, record_id)
- return
+ # if script_name not in os.listdir("."):
+ # logger.warning("No script with the name '{}' is installed.".format(
+ # script_name))
+
+ # return
- cmd = ["./"+script_name, str(record_id)]
- print("Running: "+" ".join(cmd))
- logger.debug("Running: "+" ".join(cmd))
- ret = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- print(ret.stdout.decode())
- print(ret.stderr.decode())
+ #cmd = ["./"+script_name, str(record_id)]
+ #print("Running: "+" ".join(cmd))
+ #logger.debug("Running: "+" ".join(cmd))
+ #ret = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ print(ret.stdout)
+ print(ret.stderr)
if ret.returncode != 0:
- logger.warning("Skript failed")
+ logger.warning("Script failed")
def run(dataAnalysisRecord: db.Record):
--
GitLab