Commit fe2fb048 authored by Jason Rigby's avatar Jason Rigby
Browse files

Merge branch 'update-s-drive-paths' into 'master'

add SDrivePrefix to exported functions

See merge request aspree/aspree-r-package!36
parents 8d4c1abb 517d15c0
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
export(ASPREEDb) export(ASPREEDb)
export(CalculateQueryRanges) export(CalculateQueryRanges)
export(CalculateXTQueryRanges) export(CalculateXTQueryRanges)
export(CombinedOtherCogsMeasures)
export(CombinedPathologyAU) export(CombinedPathologyAU)
export(CombinedPathologyUS) export(CombinedPathologyUS)
export(CombinedPhysicalMeasures) export(CombinedPhysicalMeasures)
export(CombinedPhysicalPerformanceMeasures)
export(CommentaryCodeSummary) export(CommentaryCodeSummary)
export(CommentaryCodesAsFactor) export(CommentaryCodesAsFactor)
export(CreateKeyPair) export(CreateKeyPair)
...@@ -36,6 +38,7 @@ export(GetXTConsent) ...@@ -36,6 +38,7 @@ export(GetXTConsent)
export(HasVisit) export(HasVisit)
export(MergeCountryBySubjectId) export(MergeCountryBySubjectId)
export(SDrivePaths) export(SDrivePaths)
export(SDrivePrefix)
export(extract_ASP_End) export(extract_ASP_End)
export(extract_Brdg_End) export(extract_Brdg_End)
export(extract_DeathDate) export(extract_DeathDate)
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#' #'
#' @param default the default prefix if the operating system-specific path can't be determined #' @param default the default prefix if the operating system-specific path can't be determined
#' @return the S-drive prefix #' @return the S-drive prefix
#' @export
SDrivePrefix <- function(default = NULL) { SDrivePrefix <- function(default = NULL) {
prefix <- switch(Sys.info()[['sysname']], prefix <- switch(Sys.info()[['sysname']],
Windows="S:/MNHS-SPHPM-EPM", Windows="S:/MNHS-SPHPM-EPM",
......
...@@ -8,6 +8,8 @@ CombinedPathologyAU(con, measures = NULL) ...@@ -8,6 +8,8 @@ CombinedPathologyAU(con, measures = NULL)
} }
\arguments{ \arguments{
\item{con}{a database connection using the DBI package or \code{ASPREEDb()}} \item{con}{a database connection using the DBI package or \code{ASPREEDb()}}
\item{measures}{subset of measures to return}
} }
\value{ \value{
the combined data the combined data
......
...@@ -8,6 +8,8 @@ CombinedPathologyUS(con, measures = NULL) ...@@ -8,6 +8,8 @@ CombinedPathologyUS(con, measures = NULL)
} }
\arguments{ \arguments{
\item{con}{a database connection using the DBI package or \code{ASPREEDb()}} \item{con}{a database connection using the DBI package or \code{ASPREEDb()}}
\item{measures}{subset of measures to return}
} }
\value{ \value{
the combined data the combined data
......
...@@ -2,12 +2,14 @@ ...@@ -2,12 +2,14 @@
% Please edit documentation in R/data_access.R % Please edit documentation in R/data_access.R
\name{CombinedPhysicalMeasures} \name{CombinedPhysicalMeasures}
\alias{CombinedPhysicalMeasures} \alias{CombinedPhysicalMeasures}
\title{Get a combined view of the pre-XT and XT physicsl measures} \title{Get a combined view of the pre-XT and XT physical measures}
\usage{ \usage{
CombinedPhysicalMeasures(con, measures = NULL) CombinedPhysicalMeasures(con, measures = NULL)
} }
\arguments{ \arguments{
\item{con}{a database connection using the DBI package or \code{ASPREEDb()}} \item{con}{a database connection using the DBI package or \code{ASPREEDb()}}
\item{measures}{subset of measures to return}
} }
\value{ \value{
the combined data the combined data
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
\alias{SDrivePaths} \alias{SDrivePaths}
\title{Get S-drive paths} \title{Get S-drive paths}
\usage{ \usage{
SDrivePaths(ver = 2, prefix = NA) SDrivePaths(ver = 3, prefix = NA)
} }
\arguments{ \arguments{
\item{prefix}{the base path of the dataset location} \item{prefix}{the base path of the dataset location}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment