Issue3087 annotation fix

Please fill in the appropriate checklist below (delete whatever is not relevant). These are the most common things requested on pull requests (PRs).

PR checklist

• This comment contains a description of changes (with reason)
• If you've fixed a bug or added code that should be tested, add tests!
• Documentation in docs is updated
• Replace dag.png with the most recent CI pipleine integrated_pe artifact
• CHANGELOG.md is updated
• README.md is updated
• LICENSE.md is updated with new contributors

Closes #87 (closed)

workflow/scripts/annotate_peaks.R

@@ -43,13 +43,14 @@ names(files) <- design$Condition
 peaks <- lapply(files, readPeakFile, as = "GRanges", header = FALSE)
 peakAnnoList <- lapply(peaks, annotatePeak, TxDb=txdb, tssRegion=c(-3000, 3000), verbose=FALSE)
 
-column_names <- c("chr", "start", "end", "width", "strand_1", "name", "score", "strand", "signalValue",
+column_names <- c("geneId","chr", "start", "end", "width", "strand_1", "name", "score", "strand", "signalValue",
                   "pValue", "qValue", "peak", "annotation", "geneChr", "geneStart", "geneEnd",
-                  "geneLength" ,"geneStrand", "geneId", "transcriptId", "distanceToTSS", "symbol")
+                  "geneLength" ,"geneStrand", "transcriptId", "distanceToTSS", "symbol")
 
 for(index in c(1:length(peakAnnoList))) {
   filename <- paste(names(peaks)[index], ".chipseeker_annotation.tsv", sep="")
   df <- as.data.frame(peakAnnoList[[index]])
+  df$geneId <- sapply(strsplit(as.character(df$geneId), split = "\\."), "[[", 1)
   df_final <- merge(df, sym, by.x="geneId", by.y="ensembl", all.x=T)
   colnames(df_final) <- column_names
   write.table(df_final[ , !(names(df_final) %in% c('strand_1'))], filename, sep="\t" ,quote=F, row.names=F)