From a3bbf76adbaf3412d0cfb88922d8b159a845502a Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 26 Sep 2024 06:56:52 -0700 Subject: [PATCH] improving error message when data hierarchy mode fails, #268 --- src/cbPyLib/cellbrowser/cellbrowser.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cbPyLib/cellbrowser/cellbrowser.py b/src/cbPyLib/cellbrowser/cellbrowser.py index b7167d1..1ddefe5 100755 --- a/src/cbPyLib/cellbrowser/cellbrowser.py +++ b/src/cbPyLib/cellbrowser/cellbrowser.py @@ -5501,14 +5501,15 @@ def resolveOutDir(outDir): def fixupName(inConfFname, inConf): " detect hierarchical mode and construct the output path " - dataRoot = findRoot(inConfFname) + inFullPath = abspath(inConfFname) + dataRoot = findRoot(dirname(inFullPath)) if dataRoot: if "name" in inConf: - logging.debug("using dataset hierarchies: 'name' in %s is ignored" % inConfFname) + logging.debug("using dataset hierarchies: 'name' in %s is ignored" % inFullPath) logging.debug("Deriving dataset name from path") - inConf["name"] = basename(dirname(abspath(inConfFname))) + inConf["name"] = basename(dirname(inFullPath)) - relPath = relpath(dirname(abspath(inConfFname)), dataRoot) + relPath = relpath(dirname(inFullPath), dataRoot) else: if not "name" in inConf: errAbort("Not running in data hierarchy mode. "