mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-16 07:19:13 +08:00
data_meta: first test for metadata files
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
Support for generating the options for a SelectToolParameter dynamically (based
|
||||
on the values of other parameters or other aspects of the current state)
|
||||
"""
|
||||
from collections import OrderedDict
|
||||
import copy
|
||||
import logging
|
||||
from collections import OrderedDict
|
||||
import os
|
||||
import re
|
||||
|
||||
@@ -164,7 +164,11 @@ class DataMetaFilter(Filter):
|
||||
if isinstance(m, list):
|
||||
meta_value |= set(m)
|
||||
elif isinstance(m, dict) or isinstance(m, OrderedDict):
|
||||
meta_value |= set([ "%s,%s" %(k, v) for k, v in m.iteritems() ])
|
||||
meta_value |= set(["%s,%s" % (k, v) for k, v in m.iteritems()])
|
||||
elif isinstance(m, str) and os.path.isfile(m):
|
||||
with open(m) as fh:
|
||||
for line in fh:
|
||||
meta_value.add(line)
|
||||
else:
|
||||
meta_value.add(m)
|
||||
|
||||
@@ -219,9 +223,9 @@ class DataMetaFilter(Filter):
|
||||
else:
|
||||
if not self.dynamic_option.columns:
|
||||
self.dynamic_option.columns = {
|
||||
"name" : 0,
|
||||
"value" : 1,
|
||||
"selected" : 2
|
||||
"name": 0,
|
||||
"value": 1,
|
||||
"selected": 2
|
||||
}
|
||||
self.dynamic_option.largest_index = 2
|
||||
for value in meta_value:
|
||||
@@ -637,7 +641,7 @@ class DynamicOptions:
|
||||
name = "a configuration file"
|
||||
# Perhaps this should be an error, but even a warning is useful.
|
||||
log.warning("Inconsistent number of fields (%i vs %i) in %s using separator %r, check line: %r" %
|
||||
(field_count, len(fields), name, self.separator, line))
|
||||
(field_count, len(fields), name, self.separator, line))
|
||||
rval.append(fields)
|
||||
return rval
|
||||
|
||||
|
||||
Reference in New Issue
Block a user