From 490e5c24fc6003ccdb56d8f9367c0d6c30216946 Mon Sep 17 00:00:00 2001
From: Robert Bossy <Robert.Bossy@inra.fr>
Date: Mon, 28 Mar 2022 14:48:17 +0200
Subject: [PATCH] differentiate layer and feature name for taxa selection
---
select-taxa.plan | 23 ++++++++++++++++-------
test.plan | 6 ++++--
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/select-taxa.plan b/select-taxa.plan
index 7b6559b..46d293d 100644
--- a/select-taxa.plan
+++ b/select-taxa.plan
@@ -5,8 +5,12 @@
<alias module="tag.taxpaths" param="mappingFile"/>
</param>
- <param name="name">
- <alias module="name" param="featureValue"/>
+ <param name="featureName">
+ <alias module="featureName" param="featureValue"/>
+ </param>
+
+ <param name="layerName">
+ <alias module="layerName" param="featureValue"/>
</param>
<param name="column">
@@ -18,10 +22,15 @@
<alias module="tag" param="select"/>
</param>
- <name class="SetFeature">
+ <featureName class="SetFeature">
+ <target>$</target>
+ <featureName>select-taxa-feature-name</featureName>
+ </featureName>
+
+ <layerName class="SetFeature">
<target>$</target>
- <featureName>select-taxa-name</featureName>
- </name>
+ <featureName>select-taxa-layer-name</featureName>
+ </layerName>
<tag>
<select>taxids</select>
@@ -43,8 +52,8 @@
<layer class="Action">
<target>documents.sections.layer:taxa[@selected-taxa]</target>
<action>
- setlayer:add(corpus.@select-taxa-name)
- | set:feat(corpus.@select-taxa-name, corpus.@select-taxa-name)
+ setlayer:add(corpus.@select-taxa-layer-name)
+ | set:feat(corpus.@select-taxa-feature-name, corpus.@select-taxa-feature-name)
| set:remove-feature:selected-taxa
</action>
<addToLayer/>
diff --git a/test.plan b/test.plan
index 2140721..2fa1eb9 100644
--- a/test.plan
+++ b/test.plan
@@ -11,12 +11,14 @@
<select-microorganisms-taxids href="select-taxa.plan">
<list>output/taxid_microorganisms.txt</list>
- <name>microorganisms-taxids</name>
+ <featureName>microorganism</featureName>
+ <layerName>microorganisms-taxids</layerName>
</select-microorganisms-taxids>
<select-microorganisms-taxpaths href="select-taxa.plan">
<list>output/microorganisms-roots-paths.txt</list>
- <name>microorganisms-taxroots</name>
+ <featureName>microorganism</featureName>
+ <layerName>microorganisms-taxroots</layerName>
<mode>taxpaths</mode>
</select-microorganisms-taxpaths>
--
GitLab