opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8038 from mvdbeek/database_operation_tool_improvements

Browse Source 
Database operation tool improvements
This commit is contained in:
John Chilton
2019-05-28 08:50:49 -04:00
committed by GitHub
parent c654406725 dd91b14b6d
commit 73832b7b69
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/model/tags.py
+2
View File
@@ -311,6 +311,8 @@ class TagHandler(object):
def _get_name_value_pair(self, tag_str):
"""Get name, value pair from a tag string."""
# Use regular expression to parse name, value.
if tag_str.startswith('#'):
tag_str = "name:%s" % tag_str[1:]
reg_exp = re.compile("[" + self.key_value_separators + "]")
name_value_pair = reg_exp.split(tag_str, 1)
# Add empty slot if tag does not have value.
lib/galaxy/tools/relabel_from_file.xml
+3
View File
@@ -147,6 +147,9 @@
in the collection. In that case only matching list identifiers will be
relabeled.
Valid identifiers must contain only characters (a-z, A-Z), numbers (0-9),
dash and underscore (-, _). Punctuation or whitespace are not allowed.
This tool will create new history datasets from your collection
but your quota usage will not increase.
]]></help>
lib/galaxy/tools/tag_collection_from_file.xml
+4 -4
View File
@@ -34,13 +34,13 @@
<assert_contents>
<has_text_matching expression="^This is a line of text.\n$" />
</assert_contents>
<metadata name="tags" value="alias:f,alias:r1,orientation:forward,zoo" />
<metadata name="tags" value="alias:f,alias:r1,name:forward,orientation:forward,zoo" />
</element>
<element name="reverse">
<assert_contents>
<has_text_matching expression="^This is a different line of text.\n$" />
</assert_contents>
<metadata name="tags" value="alias:r,alias:r2,orientation:reverse" />
<metadata name="tags" value="alias:r,alias:r2,name:reverse,orientation:reverse" />
</element>
</output_collection>
</test>
@@ -63,13 +63,13 @@
<assert_contents>
<has_text_matching expression="^This is a line of text.\n$" />
</assert_contents>
<metadata name="tags" value="alias:f,alias:r1,orientation:forward" />
<metadata name="tags" value="alias:f,alias:r1,name:forward,orientation:forward" />
</element>
<element name="reverse">
<assert_contents>
<has_text_matching expression="^This is a different line of text.\n$" />
</assert_contents>
<metadata name="tags" value="alias:r,alias:r2,orientation:reverse" />
<metadata name="tags" value="alias:r,alias:r2,name:reverse,orientation:reverse" />
</element>
</element>
</output_collection>
test-data/new_tags_1.txt
+2 -2
View File
@@ -1,2 +1,2 @@
forward orientation:forward alias:r1 alias:f
reverse orientation:reverse alias:r2 alias:r
forward orientation:forward alias:r1 alias:f #forward
reverse orientation:reverse alias:r2 alias:r #reverse