diff --git a/README.md b/README.md index 92ea3eb4..8320276f 100644 --- a/README.md +++ b/README.md @@ -95,9 +95,9 @@ the final BioPAX models to SIF, GMT, TXT formats. cd downloads -Copy the latest paxtools.jar into this current directory and run - +Copy the latest paxtools.jar into this directory and run - - sh export.sh 2>&1 >console.out & + sh export.sh 2>&1 >export.log & (- which takes overnight or a day and night); upload/copy/move (but keep at least blacklist.txt, *All.BIOPAX.owl.gz) all the files from this here and ../data/ directories to the file server, or configure so that they can be downloaded diff --git a/src/main/java/cpath/service/ConsoleApplication.java b/src/main/java/cpath/service/ConsoleApplication.java index 380ec6ca..16a83445 100644 --- a/src/main/java/cpath/service/ConsoleApplication.java +++ b/src/main/java/cpath/service/ConsoleApplication.java @@ -368,10 +368,10 @@ private void postmerge() throws IOException { writer.println(String.format("gzip %s.*.txt %s.*.sif %s.*.gmt %s.*.xml", commonPrefix, commonPrefix, commonPrefix, commonPrefix)); //generate pathways.txt (parent-child) and physical_entities.json (URI-to-IDs mapping) files - writer.println(String.format("%s %s '%s' '%s' %s 2>&1 &", JAVA_PAXTOOLS, "summarize", + writer.println(String.format("%s %s '%s' '%s' %s 2>&1", JAVA_PAXTOOLS, "summarize", service.settings().biopaxFileName("All"), "pathways.txt", "--pathways")); //generate the list of physical entities (some uri, names, ids) as json array: - writer.println(String.format("%s %s '%s' '%s' %s 2>&1 &", JAVA_PAXTOOLS, "summarize", + writer.println(String.format("%s %s '%s' '%s' %s 2>&1", JAVA_PAXTOOLS, "summarize", service.settings().biopaxFileName("All"), "physical_entities.json", "--uri-ids")); //filter and convert just created above file to the json map of only "generic" PEs: writer.println(""" @@ -389,16 +389,15 @@ private void writeScriptCommands(String bpFilename, PrintWriter writer, boolean final String prefix = bpFilename.substring(0, bpFilename.indexOf("BIOPAX.")); final String commaSepTaxonomyIds = String.join(",", service.settings().getOrganismTaxonomyIds()); if (exportToGSEA) { - writer.println(String.format("%s %s '%s' '%s' %s 2>&1 &", JAVA_PAXTOOLS, "toGSEA", bpFilename, + writer.println(String.format("%s %s '%s' '%s' %s 2>&1", JAVA_PAXTOOLS, "toGSEA", bpFilename, prefix + "hgnc.gmt", "'hgnc.symbol' 'organisms=" + commaSepTaxonomyIds + "'"));//'hgnc.symbol' - important -// writer.println(String.format("%s %s '%s' '%s' %s 2>&1 &", JAVA_PAXTOOLS, "toGSEA", bpFilename, +// writer.println(String.format("%s %s '%s' '%s' %s 2>&1", JAVA_PAXTOOLS, "toGSEA", bpFilename, // prefix + "uniprot.gmt", "'uniprot' 'organisms=" + commaSepTaxonomyIds + "'")); -// writer.println("wait"); //important if JAVA_PAXTOOLS command starts with "nohup" writer.println("echo \"Converted " + bpFilename + " to GSEA.\""); } - writer.println(String.format("%s %s '%s' '%s' %s 2>&1 &", JAVA_PAXTOOLS, "toSIF", bpFilename, + writer.println(String.format("%s %s '%s' '%s' %s 2>&1", JAVA_PAXTOOLS, "toSIF", bpFilename, prefix + "hgnc.txt", "seqDb=hgnc -extended -andSif exclude=neighbor_of")); - //UniProt based extended SIF files can be huge, take too long (2 days) to generate; skip for now. + //UniProt based xSIF files can be huge and take too long (2 days) to generate; skip for now. writer.println("echo \"Converted " + bpFilename + " to SIF.\""); }