changeset 8:548802b3492f

Version 1.0.9 - Added R session info to output - Added email for bug reports - Changed edgeR requirement to be stopping condition - Changed names of gene-wise comparison tables to "gene_level" from "roast" - Fixed selection of multiple genes for barcode plotting

--- a/hairpinTool.R	Wed Apr 23 14:05:26 2014 +1000
+++ b/hairpinTool.R	Fri May 02 17:22:24 2014 +1000
@@ -58,7 +58,11 @@
 library(limma, quietly=TRUE, warn.conflicts=FALSE)
 
 if (packageVersion("edgeR") < "3.5.23") {
-  message("Please update 'edgeR' to version >= 3.5.23 to run this script")
+  stop("Please update 'edgeR' to version >= 3.5.23 to run this tool")
+}
+
+if (packageVersion("limma")<"3.19.19") {
+  message("Update 'limma' to version >= 3.19.19 to see updated barcode graphs")
 }
 
 ################################################################################
@@ -305,12 +309,13 @@
     smearPng[i] <- makeOut(paste0("smear(", contrastData[i], ").png"))
     smearPdf[i] <- makeOut(paste0("smear(", contrastData[i], ").pdf"))
     topOut[i] <- makeOut(paste0("toptag(", contrastData[i], ").tsv"))
-    roastOut[i] <- makeOut(paste0("roast(", contrastData[i], ").tsv"))
+    roastOut[i] <- makeOut(paste0("gene_level(", contrastData[i], ").tsv"))
     barcodePng[i] <- makeOut(paste0("barcode(", contrastData[i], ").png"))
     barcodePdf[i] <- makeOut(paste0("barcode(", contrastData[i], ").pdf"))
   }
 }
 countsOut <- makeOut("counts.tsv")
+sessionOut <- makeOut("session_info.txt")
 
 # Initialise data for html links and images, table with the link label and
 # link address
@@ -346,7 +351,7 @@
     selectVals <- as.numeric(unique(selectVals))
   } else {
     selectVals <- gsub(" ", "", selectVals, fixed=TRUE)
-    selectVals <- unlist(strsplit(selectVals, " "))
+    selectVals <- unlist(strsplit(selectVals, ","))
   }                                                           
 }
                                                   
@@ -593,7 +598,7 @@
       write.table(roastData, file=roastOut[i], row.names=FALSE, sep="\t")
       linkName <- paste0("Gene Level Analysis Table(", contrastData[i], 
                          ") (.tsv)")
-      linkAddr <- paste0("roast(", contrastData[i], ").tsv")
+      linkAddr <- paste0("gene_level(", contrastData[i], ").tsv")
       linkData <- rbind(linkData, c(linkName, linkAddr))
       if (selectOpt=="rank") {
         selectedGenes <- rownames(roastData)[selectVals]
@@ -636,6 +641,7 @@
   }
 }
 
+# Generate data frame of the significant differences
 sigDiff <- data.frame(Up=upCount, Flat=flatCount, Down=downCount)
 if (workMode == "glm") {
   row.names(sigDiff) <- contrastData
@@ -643,13 +649,19 @@
   row.names(sigDiff) <- paste0(pairData[2], "-", pairData[1])
 }
 
+# Output table of summarised counts
 ID <- rownames(data$counts)
 outputCounts <- cbind(ID, data$counts)
-write.table(outputCounts, file=countsOut, row.names=FALSE, sep="\t")
+write.table(outputCounts, file=countsOut, row.names=FALSE, sep="\t",
+            quote=FALSE)
 linkName <- "Counts table (.tsv)"
 linkAddr <- "counts.tsv"
 linkData <- rbind(linkData, c(linkName, linkAddr))
 
+# Record session info
+writeLines(capture.output(sessionInfo()), sessionOut)
+linkData <- rbind(linkData, c("Session Info", "session_info.txt"))
+
 # Record ending time and calculate total run time
 timeEnd <- as.character(Sys.time())
 timeTaken <- capture.output(round(difftime(timeEnd,timeStart), digits=3))
@@ -730,7 +742,7 @@
 
 cata("<h4>Plots:</h4>\n")
 for (i in 1:nrow(linkData)) {
-  if (!grepl(".tsv", linkData$Link[i])) {
+  if (grepl(".pdf", linkData$Link[i])) {
     HtmlLink(linkData$Link[i], linkData$Label[i])
   }
 }
@@ -756,7 +768,7 @@
 }
 
 if (cpmReq!=0 && sampleReq!=0) {
-  tempStr <- paste("Hairpins with less than", cpmReq,
+  tempStr <- paste("Hairpins without more than", cpmReq,
                    "CPM in at least", sampleReq, "samples are insignificant",
                    "and filtered out.")
   ListItem(tempStr)
@@ -807,6 +819,14 @@
 ListItem(cit[4])
 cata("</ol>\n")
 
+cata("<p>Report problems to: [e-mail]</p>\n")
+
+for (i in 1:nrow(linkData)) {
+  if (grepl("session_info", linkData$Link[i])) {
+    HtmlLink(linkData$Link[i], linkData$Label[i])
+  }
+}
+
 cata("<table border=\"0\">\n")
 cata("<tr>\n")
 TableItem("Task started at:"); TableItem(timeStart)

--- a/hairpinTool.xml	Wed Apr 23 14:05:26 2014 +1000
+++ b/hairpinTool.xml	Fri May 02 17:22:24 2014 +1000
@@ -1,4 +1,4 @@
-<tool id="shRNAseq" name="shRNAseq Tool" version="1.0.8">
+<tool id="shRNAseq" name="shRNAseq Tool" version="1.0.9">
   <description>
     Analyse hairpin differential representation using edgeR
   </description>
@@ -405,6 +405,8 @@
 	* McCarthy DJ, Chen Y and Smyth GK (2012). Differential expression analysis 
 	  of multifactor RNA-Seq experiments with respect to biological variation. 
 	  Nucleic Acids Research 40, 4288-4297
+	  
+Report problems to: [e-mail]
 
 .. _edgeR: http://www.bioconductor.org/packages/release/bioc/html/edgeR.html
 .. _limma: http://www.bioconductor.org/packages/release/bioc/html/limma.html