Dekker1/Fourmi
Archived
1
0
Fork 0
Code

gui now calls fourmi.search correctly

Browse Source
This commit is contained in:
Harmen Prins 2014-06-11 17:05:26 +02:00
parent aeb7366161
commit b0a51da18e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GUI/gui.cfg
View File

@ -9,5 +9,5 @@ AlwaysParameters = Zero, Name
# What filetype the output will be saved in # What filetype the output will be saved in
# If just one, will be used without the possibility of selecting another # If just one, will be used without the possibility of selecting another
OutputTypes = jsonlines OutputTypes = csv
#, json, csv, xml #jsonlines, json, csv, xml

9
GUI/gui.py
View File

@ -159,7 +159,7 @@ class GUI():
print self.values print self.values
if self.values.get('all_attributes'): if self.values.get('all_attributes'):
attributes = "" attributes = ".*"
else: else:
attribute_types = ['attributes', 'Common attributes', 'Always attributes'] attribute_types = ['attributes', 'Common attributes', 'Always attributes']
attributes = ','.join([str(self.values.get(attribute)) for attribute in attribute_types]) attributes = ','.join([str(self.values.get(attribute)) for attribute in attribute_types])
@ -171,13 +171,14 @@ class GUI():
'--format': self.values.get('output_type'), '--format': self.values.get('output_type'),
'--help': False, '--help': False,
'--include': None, '--include': None,
'--log': None, '--log': 'log.txt',
'--output': 'result.*format*', '--output': 'results.*format*',
'--verbose': False, '--verbose': True,
'--version': False, '--version': False,
'<compound>': self.values.get('substance'), '<compound>': self.values.get('substance'),
'list': False, 'list': False,
'search': True} 'search': True}
source_loader = SourceLoader() source_loader = SourceLoader()
search(arguments, source_loader) search(arguments, source_loader)