Merge pull request #5 from datashield/v6.1.1-dev

V6.1.1 dev

Author: davraam

DESCRIPTION

@@ -1,13 +1,13 @@
 Package: dsBaseClient
 Title: DataSHIELD Client Functions
-Version: 6.1.1-1
+Version: 6.1.1-2
 Author: DataSHIELD Developers <datashield@newcastle.ac.uk>
 Maintainer: DataSHIELD Developers <datashield@newcastle.ac.uk>
 Description: DataSHIELD client functions for the client side.
 License: GPL-3
 Depends:
     R (>= 3.5.0),
-    DSI (>= 1.1.0)
+    DSI (>= 1.2.0)
 Imports:
     fields,
     metafor,

R/ds.asCharacter.R

@@ -54,7 +54,7 @@
 #' }   
 #' @author DataSHIELD Development Team
 #' @export
-ds.asCharacter = function(x.name=NULL, newobj=NULL, datasources=NULL){
+ds.asCharacter <- function(x.name=NULL, newobj=NULL, datasources=NULL){
 
   # look for DS connections
   if(is.null(datasources)){

R/ds.asDataMatrix.R

@@ -55,7 +55,7 @@
 #' }   
 #' @author DataSHIELD Development Team
 #' @export
-ds.asDataMatrix = function(x.name=NULL, newobj=NULL, datasources=NULL){
+ds.asDataMatrix <- function(x.name=NULL, newobj=NULL, datasources=NULL){
 
   # look for DS connections
   if(is.null(datasources)){

R/ds.asList.R

@@ -55,7 +55,7 @@
 #' }   
 #' @author  DataSHIELD Development Team
 #' @export
-ds.asList = function(x.name=NULL, newobj=NULL, datasources=NULL){
+ds.asList <- function(x.name=NULL, newobj=NULL, datasources=NULL){
 
   # look for DS connections
   if(is.null(datasources)){

R/ds.asLogical.R

@@ -55,7 +55,7 @@
 #' }   
 #' @author DataSHIELD Development Team
 #' @export
-ds.asLogical = function(x.name=NULL, newobj=NULL, datasources=NULL){
+ds.asLogical <- function(x.name=NULL, newobj=NULL, datasources=NULL){
 
   # look for DS connections
   if(is.null(datasources)){

R/ds.asNumeric.R

@@ -69,7 +69,7 @@
 #' }   
 #' @author DataSHIELD Development Team
 #' @export
-ds.asNumeric = function(x.name=NULL, newobj=NULL, datasources=NULL){
+ds.asNumeric <- function(x.name=NULL, newobj=NULL, datasources=NULL){
 
   # look for DS connections
   if(is.null(datasources)){

R/ds.corTest.R

@@ -51,7 +51,7 @@
 #' }   
 #'
 #'
-ds.corTest = function(x=NULL, y=NULL, datasources=NULL){
+ds.corTest <- function(x=NULL, y=NULL, datasources=NULL){
 
   # look for DS connections
   if(is.null(datasources)){

R/ds.exp.R

@@ -55,7 +55,7 @@
 #'
 #' }
 #'
-ds.exp = function(x=NULL, newobj=NULL, datasources=NULL){
+ds.exp <- function(x=NULL, newobj=NULL, datasources=NULL){
 
   # look for DS connections
   if(is.null(datasources)){

R/ds.isValid.R

@@ -57,7 +57,7 @@
 #'
 #' }
 #'
-ds.isValid = function(x=NULL, datasources=NULL){
+ds.isValid <- function(x=NULL, datasources=NULL){
 
   # look for DS connections
   if(is.null(datasources)){

R/ds.length.R

@@ -74,7 +74,7 @@
 #'   datashield.logout(connections)
 #' }
 #'
-ds.length = function(x=NULL, type='both', checks='FALSE', datasources=NULL){
+ds.length <- function(x=NULL, type='both', checks='FALSE', datasources=NULL){
 
   ##################################################################################################################
   #MODULE 1: IDENTIFY DEFAULT CONNECTIONS                                                                          #