diff --git a/R/datasheet.R b/R/datasheet.R index cfa43183..bfc69adc 100644 --- a/R/datasheet.R +++ b/R/datasheet.R @@ -641,7 +641,7 @@ setMethod("datasheet", } if (!returnInvisible) { - sheetInfo <- subset(sheetInfo, is.element(visible, c("Yes"))) + sheetInfo <- sheetInfo[sheetInfo$visible == "Yes",] } sheetInfo <- sheetInfo[order(sheetInfo$id), ] diff --git a/R/package.R b/R/package.R index 0274c96c..b38168e7 100644 --- a/R/package.R +++ b/R/package.R @@ -84,12 +84,16 @@ setMethod("package", signature(ssimObject = "Session"), function(ssimObject, ins } else if (grepl("The remote name could not be resolved", tt[1])) { out <- "Could not connect to the package server." } else { - out <- .dataframeFromSSim(tt, colNames = c("name", "description", "version"), csv = FALSE) + out <- .dataframeFromSSim(tt, localNames = TRUE, csv=FALSE) } + drops <- c("x") + out <- out[ , !(names(out) %in% drops)] return(out) } else { tt <- command(c("list", arg, "csv"), ssimObject) out <- .dataframeFromSSim(tt, localNames = TRUE, csv = FALSE) + drops <- c("x") + out <- out[ , !(names(out) %in% drops)] return(out) } } else { @@ -99,7 +103,7 @@ setMethod("package", signature(ssimObject = "Session"), function(ssimObject, ins pkgList <- command(c("installed"), ssimObject, program = "SyncroSim.PackageManager.exe") pkgDf <- .dataframeFromSSim(pkgList, - colNames = c("name", "description", "version"), + localNames = TRUE, csv = FALSE) if (listTemplates %in% pkgDf$name == FALSE) { stop("SyncroSim package not installed") @@ -112,6 +116,8 @@ setMethod("package", signature(ssimObject = "Session"), function(ssimObject, ins out <- .dataframeFromSSim(tt, colNames =c("name", "displayName", "installed"), csv = F) + drops <- c("x") + out <- out[ , !(names(out) %in% drops)] return(out) } else { stop("listTemplates must be a character name of a SyncroSim Package") diff --git a/R/session.R b/R/session.R index 794ebae2..940e55c1 100644 --- a/R/session.R +++ b/R/session.R @@ -27,7 +27,7 @@ setMethod(f = "initialize", signature = "Session", definition = function(.Object loadVersion <- FALSE if (ssimCurrentVersionBits[1] >= ssimRequiredVersionBits[1]){ - if (ssimCurrentVersionBits[1] > ssimRequiredVersion[1]) { + if (ssimCurrentVersionBits[1] > ssimRequiredVersionBits[1]) { loadVersion <- TRUE } else { if (ssimCurrentVersionBits[2] >= ssimRequiredVersionBits[2]){ @@ -35,7 +35,7 @@ setMethod(f = "initialize", signature = "Session", definition = function(.Object loadVersion <- TRUE } else { if (ssimCurrentVersionBits[3] >= ssimRequiredVersionBits[3]){ - if (ssimCurrentVersionBits[3] > ssimRequiredVersionBits[3]){ + if (ssimCurrentVersionBits[3] >= ssimRequiredVersionBits[3]){ loadVersion <- TRUE } }