Skip to content

Commit

Permalink
Fixes to address problems reported by COPO, linked to issues #67 #63,…
Browse files Browse the repository at this point in the history
… as well as a few others.

* Add missing STUDY_SET element to study.xml output
* Modifications to SraExportPipelineComponent for new and updated assay types supported by SRA 1.5

Note, some of these changes may affect ISAcreator and ISAconfigurator builds. Until tested with those, keep these changes in this hotfix/copo-sra-export branch.
  • Loading branch information
djcomlab committed Jul 27, 2016
1 parent 66b281f commit f4d6ff0
Show file tree
Hide file tree
Showing 3 changed files with 417 additions and 121 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,13 @@ public static void main(String[] args) {
ISATABReducedMapper mapper = new ISATABReducedMapper(new BIIObjectStore(), loader.load());
ISAConfiguratorValidator validator = new ISAConfiguratorValidator(mapper.map());
log.info("Running validator");
if (validator.validate() != GUIInvokerResult.SUCCESS) {
log.warn("Validation failed");
GUIInvokerResult validationResult = validator.validate();
if (validationResult == GUIInvokerResult.ERROR) {
throw new Exception("Validation failed");
} else {
if (validationResult == GUIInvokerResult.WARNING) {
log.warn("Validation succceded with warnings");
}
log.info("Using SraExporter");
SraExporter exporter = new SraExporter(store, sourceDirPath, exportPath);
exporter.export();
Expand Down

0 comments on commit f4d6ff0

Please sign in to comment.