Browse code

Attempt in making current developer version of GenomicsDB-R work.

Markus Riester authored on 12/06/2023 17:58:51
Showing 1 changed files

... ...
@@ -151,13 +151,19 @@ calculateMappingBiasGatk4 <- function(workspace, reference.genome,
151 151
         .stopUserError("Install the genomicsdb and jsonlite R packages for GenomicsDB import.")
152 152
     }
153 153
     workspace <- normalizePath(workspace, mustWork = TRUE)
154
-
155
-    db <- genomicsdb::connect(workspace = workspace,
156
-        vid_mapping_file = file.path(workspace, "vidmap.json"),
157
-        callset_mapping_file = file.path(workspace, "callset.json"),
158
-        reference_genome = reference.genome,
159
-        c("DP", "AD", AF.info.field))
160
-
154
+    
155
+    if (!is.null(formals(genomicsdb::connect)$reference_genome)) {
156
+        db <- genomicsdb::connect(workspace = workspace,
157
+            vid_mapping_file = file.path(workspace, "vidmap.json"),
158
+            callset_mapping_file = file.path(workspace, "callset.json"),
159
+            reference_genome = reference.genome,
160
+            attributes = c("DP", "AD", AF.info.field))
161
+    } else {
162
+        db <- genomicsdb::connect(workspace = workspace,
163
+            vid_mapping_file = file.path(workspace, "vidmap.json"),
164
+            callset_mapping_file = file.path(workspace, "callset.json"),
165
+            attributes = c("DP", "AD", AF.info.field))
166
+    }    
161 167
     jcallset <- jsonlite::read_json(file.path(workspace, "callset.json"))
162 168
     jvidmap <- jsonlite::read_json(file.path(workspace, "vidmap.json"))
163 169