Browse code

Fix output_path when split_output is FALSE

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/gmapR@69221 bc3139a8-67e5-0310-9ffc-ced21a209358

Michael Lawrence authored on 07/09/2012 22:03:43
Showing 1 changed files

... ...
@@ -24,8 +24,14 @@ setMethod("gsnap", c("character", "characterORNULL", "GsnapParam"),
24 24
               params_list$split_output <- output
25 25
               output_path <- output_dir
26 26
             } else {
27
-              output_path <- paste0("> ", output, ".sam")
28
-              params_list$.redirect <- output_path
27
+              output_path <- paste0(output, ".sam")
28
+              params_list$.redirect <- paste(">", output_path)
29
+            }
30
+
31
+            if (is.null(params_list$gunzip)) {
32
+              if (file_ext(input_a) == "gz" && file_ext(input_b) == "gz") {
33
+                params_list$gunzip <- TRUE
34
+              }
29 35
             }
30 36
             
31 37
             do.call(.gsnap,
... ...
@@ -65,7 +71,7 @@ setMethod("gsnap", c("character", "characterORNULL", "GsnapParam"),
65 71
                    mode = c("standard", "cmet-stranded", "cmet-nonstranded",
66 72
                      "atoi-stranded", "atoi-nonstranded"),
67 73
                    tallydir = NULL, use_tally = NULL,
68
-                   use_runlength = NULL, nthreads = NULL,
74
+                   use_runlength = NULL, nthreads = 1L,
69 75
                    gmap_mode = "pairsearch,terminal,improve",
70 76
                    trigger_score_for_gmap = 5L, max_gmap_pairsearch = 3L,
71 77
                    max_gmap_improvement = 3L, microexon_spliceprob = 0.90,