From e314bbf396848174ba0251321a4b1fc835fc8a89 Mon Sep 17 00:00:00 2001
From: leifeld <philip.leifeld@essex.ac.uk>
Date: Sun, 12 Jun 2022 11:34:10 +0100
Subject: [PATCH] Fixed a bug with dna_openConnectionProfile and a gradle bug

---
 dna/build.gradle | 2 +-
 rDNA/R/rDNA.R    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dna/build.gradle b/dna/build.gradle
index 5947cb32..b375101e 100644
--- a/dna/build.gradle
+++ b/dna/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha7'
     // https://mvnrepository.com/artifact/org.slf4j/slf4j-nop
-    testImplementation group: 'org.slf4j', name: 'slf4j-nop', version: '2.0.0-alpha7'
+    implementation group: 'org.slf4j', name: 'slf4j-nop', version: '2.0.0-alpha7'
     // https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc
     implementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.36.0.3'
     // https://mvnrepository.com/artifact/org.swinglabs.swingx/swingx-all
diff --git a/rDNA/R/rDNA.R b/rDNA/R/rDNA.R
index 7bd72996..f1889c35 100644
--- a/rDNA/R/rDNA.R
+++ b/rDNA/R/rDNA.R
@@ -169,7 +169,7 @@ dna_jar <- function() {
     setwd(oldwd)
     builtjar <- paste0(td, "/dna-master/dna/build/libs/dna-", v, ".jar")
     if (file.exists(builtjar)) {
-      message("DNA source code downloaded and Jar file successfully built.")
+      message("DNA source code downloaded and jar file built successfully.")
     }
   }, error = function(e) {success <- FALSE})
   
@@ -499,6 +499,8 @@ dna_closeDatabase <- function() {
 dna_saveConnectionProfile <- function(file, coderPassword = "") {
   if (is.null(file) || !is.character(file) || length(file) != 1) {
     stop("Please provide a file name for the connection profile.")
+  } else {
+    file <- normalizePath(file)
   }
   if (is.null(coderPassword) || !is.character(coderPassword) || coderPassword == "") {
     if (!requireNamespace("askpass", quietly = TRUE)) {
@@ -562,6 +564,8 @@ dna_openConnectionProfile <- function(file, coderPassword = "") {
   }
   if (!file.exists(file)) {
     stop("File does not exist.")
+  } else {
+    file <- normalizePath(file)
   }
   if (is.null(coderPassword) || !is.character(coderPassword) || coderPassword == "") {
     if (!requireNamespace("askpass", quietly = TRUE)) {