allpy
changeset 1063:6f2f17139d76
pair-cores/web: remove "Markup" input
Web-UI user is unlikely to have markup input.
| author | Boris Nagaev <bnagaev@gmail.com> |
|---|---|
| date | Wed, 16 May 2012 23:27:22 +0400 |
| parents | 5f8b5a13adfa |
| children | 294ae0731a37 |
| files | pair_cores/web/pair-cores.cpp |
| diffstat | 1 files changed, 3 insertions(+), 22 deletions(-) [+] |
line diff
1.1 --- a/pair_cores/web/pair-cores.cpp Wed May 16 23:21:30 2012 +0400 1.2 +++ b/pair_cores/web/pair-cores.cpp Wed May 16 23:27:22 2012 +0400 1.3 @@ -18,23 +18,9 @@ 1.4 1.5 TaskNumberQueue queue(100); 1.6 1.7 -bool validate(AbstractTask* task, TextFileInput* input_markup, 1.8 - TextFileInput* input_aln) { 1.9 - bool markup = input_markup->state() == AbstractInput::VALID; 1.10 - bool aln = input_aln->state() == AbstractInput::VALID; 1.11 - if (markup != aln) { 1.12 - task->set_message(""); 1.13 - return true; 1.14 - } else { 1.15 - task->set_message(WString::tr("pair.in.Error_one_input")); 1.16 - return false; 1.17 - } 1.18 -} 1.19 - 1.20 -std::string name_gen(TextFileInput* input_markup, TextFileInput* input_aln, 1.21 +std::string name_gen(TextFileInput* input_aln, 1.22 std::string extension) { 1.23 - TextFileInput* input = input_markup->state() == AbstractInput::VALID ? 1.24 - input_markup : input_aln; 1.25 + TextFileInput* input = input_aln; 1.26 std::string file = input->file_upload()->clientFileName().toUTF8(); 1.27 std::string without_extension = file.substr(0, file.find_last_of(".")); 1.28 if (without_extension.empty()) { 1.29 @@ -81,10 +67,6 @@ 1.30 // 1.31 TableTask* task = new TableTask(root()); 1.32 // 1.33 - TextFileInput* input_markup = new TextFileInput("-m"); 1.34 - input_markup->set_required(false); 1.35 - task->add_input(input_markup, tr("pair.in.Markup")); 1.36 - // 1.37 TextFileInput* input_aln = new TextFileInput("-i"); 1.38 input_aln->set_required(false); 1.39 task->add_input(input_aln, tr("pair.in.Alignment")); 1.40 @@ -125,7 +107,7 @@ 1.41 // outputs 1.42 // 1.43 boost::function<std::string(std::string)> name_gen2 = boost::bind(name_gen, 1.44 - input_markup, input_aln, _1); 1.45 + input_aln, _1); 1.46 // 1.47 ViewFileOutput* homology = new ViewFileOutput("-y"); 1.48 homology->set_suggested_gen(boost::bind(name_gen2, "hom")); 1.49 @@ -169,7 +151,6 @@ 1.50 // 1.51 task->set_runner(new ForkingRunner("pair-cores")); 1.52 task->set_queue(&queue); 1.53 - task->set_validator(boost::bind(validate, task, input_markup, input_aln)); 1.54 new TaskCountup(task, root()); 1.55 // 1.56 new WBreak(root());