From cbeec1aaf46f12567f339230dd9129aa1dc1ad0e Mon Sep 17 00:00:00 2001
From: aknecht2 <aknecht2@unl.edu>
Date: Fri, 6 Nov 2015 13:06:48 -0600
Subject: [PATCH] Fixed asterisk escaping for logic strings.
---
ih/imgproc.py | 1 +
ih/workflow.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ih/imgproc.py b/ih/imgproc.py
index 3d2d7e7..d847254 100644
--- a/ih/imgproc.py
+++ b/ih/imgproc.py
@@ -1094,6 +1094,7 @@ class Image(object):
up complex filtering into multiple steps for readability. Finally, despite
the fact this function solves arbitrary logic, it is very fast.
"""
+ print logic
filter = ColorFilter(logic)
roi = self._loadROI(roi)
self.image = filter.apply(self.image, roi)
diff --git a/ih/workflow.py b/ih/workflow.py
index 20a79f6..7965f8a 100644
--- a/ih/workflow.py
+++ b/ih/workflow.py
@@ -150,9 +150,9 @@ class Workflow(object):
arglist.append(outputs[str(arguments[arg])]["file"])
else:
if "osg" in self.config:
- arglist.append("'" + str(arguments[arg]) + "'")
+ arglist.append("'" + str(arguments[arg]).replace("*","\*") + "'")
else:
- arglist.append(str(arguments[arg]))
+ arglist.append(str(arguments[arg])).replace("*","\*")
self.jobs[dax][jobname].addArguments(*arglist)
if dependencies:
for depend in dependencies:
--
GitLab