From 6af6c46fbe6edff76f7ba9e34393d057c5a1dfba Mon Sep 17 00:00:00 2001
From: Stefan Froehlich <s.froehlich@fz-juelich.de>
Date: Thu, 22 Oct 2015 09:19:15 +0000
Subject: [PATCH] Task #8640 New control keyword for generic pipeline steps
'mapfiles_as_string'. This is a ListField and any mapfiles given in this list
indicate that when this mapfile is used in other places in the step it
represents the string of the mapfile filename and not the 'file' entry within
the mapfile.
---
.../recipes/sip/master/executable_args.py | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/CEP/Pipeline/recipes/sip/master/executable_args.py b/CEP/Pipeline/recipes/sip/master/executable_args.py
index b1521ed784e..adead70051d 100644
--- a/CEP/Pipeline/recipes/sip/master/executable_args.py
+++ b/CEP/Pipeline/recipes/sip/master/executable_args.py
@@ -77,6 +77,12 @@ class executable_args(BaseRecipe, RemoteCommandRecipeMixIn):
default=[],
optional=True
),
+ 'mapfiles_as_string': ingredient.ListField(
+ '--mapfiles_as_string',
+ help="List of the input mapfiles to ignore and just use the name string instead.",
+ default=[],
+ optional=True
+ ),
'mapfiles_out': ingredient.ListField(
'--mapfiles-out',
help="List of the output mapfiles containing the names of the "
@@ -288,10 +294,11 @@ class executable_args(BaseRecipe, RemoteCommandRecipeMixIn):
filedict = {}
if self.inputs['inputkeys'] and not self.inputs['skip_infile']:
- for key, filemap in zip(self.inputs['inputkeys'], inputmapfiles):
- filedict[key] = []
- for inp in filemap:
- filedict[key].append(inp.file)
+ for key, filemap, mapname in zip(self.inputs['inputkeys'], inputmapfiles, self.inputs['mapfiles_in']):
+ if not mapname in self.inputs['mapfiles_as_string']:
+ filedict[key] = []
+ for inp in filemap:
+ filedict[key].append(inp.file)
if self.inputs['outputkey']:
filedict[self.inputs['outputkey']] = []
--
GitLab