Skip to content

Commit ef2958f

Browse files
authored
Merge pull request #128 from torres-alexis/DEV_GeneLab_Reference_Annotations_vGL-DPPD-7110-A
[GL_RefAnnotTable] Execution fixes
2 parents e3dfb4b + dcdf589 commit ef2958f

File tree

5 files changed

+98
-68
lines changed

5 files changed

+98
-68
lines changed

GeneLab_Reference_Annotations/Pipeline_GL-DPPD-7110_Versions/GL-DPPD-7110-A/GL-DPPD-7110-A.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ lib_path <- file.path(getwd())
187187

188188
# Define variables associated with current pipeline and annotation table versions
189189
GL_DPPD_ID <- "GL-DPPD-7110-A"
190+
workflow_version <- ""
191+
190192
ref_tab_path <- "https://raw.githubusercontent.com/nasa/GeneLab_Data_Processing/master/GeneLab_Reference_Annotations/Pipeline_GL-DPPD-7110_Versions/GL-DPPD-7110-A/GL-DPPD-7110-A_annotations.csv"
191193
readme_path <- "https://github.com/nasa/GeneLab_Data_Processing/tree/master/GeneLab_Reference_Annotations/Workflow_Documentation/GL_RefAnnotTable-A/README.md"
192194

@@ -212,6 +214,7 @@ library(rtracklayer)
212214
**Output Data:**
213215

214216
- `GL_DPPD_ID` (variable specifying the GeneLab Data Processing Pipeline Document ID)
217+
- `workflow_version` (variable specifying the [current version of the workflow](https://github.com/nasa/GeneLab_Data_Processing/tree/DEV_GeneLab_Reference_Annotations_vGL-DPPD-7110-A/GeneLab_Reference_Annotations/Workflow_Documentation/GL_RefAnnotTable-A))
215218
- `ref_tab_path` (variable specifying the path to the reference table CSV file)
216219
- `readme_path` (variable specifying the path to the README file)
217220
- `currently_accepted_orgs` (variable specifying the list of currently supported organisms)
@@ -240,7 +243,7 @@ target_info <- ref_table %>%
240243

241244
# Extract the relevant columns from the reference table
242245
target_taxid <- target_info$taxon # Taxonomic identifier
243-
target_org_db <- target_info$annotations # org.eg.db R package
246+
target_org_db <- target_info$bioconductor_annotations # org.eg.db R package
244247
gtf_link <- target_info$gtf # Path to reference assembly GTF
245248
target_short_name <- target_info$name # PANTHER / UNIPROT short name; blank if not available
246249
ref_source <- target_info$ref_source # Reference files source
@@ -280,7 +283,7 @@ if ( file.exists(out_table_filename) ) {
280283
**Output Data:**
281284

282285
- `target_taxid` (variable specifying the taxonomic identifier for the target organism)
283-
- `target_org_db` (variable specifying the name of the org.db R package for the target organism)
286+
- `target_org_db` (variable specifying the name of the org.eg.db R package for the target organism if it is hosted by Bioconductor)
284287
- `gtf_link` (variable specifying the URL to the GTF file for the target organism)
285288
- `target_short_name` (variable specifying the PANTHER/UNIPROT short name for the target organism)
286289
- `ref_source` (variable specifying the source of the reference files, e.g., "ensembl", "ensembl_plants", "ensembl_bacteria", "ncbi")

0 commit comments

Comments
 (0)