Add error messages for datasheets w/o package prefixes

syncrosim · Dec 6, 2023 · 2deda63 · 2deda63
1 parent 6f17788
commit 2deda63
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/R/datasheet.R b/R/datasheet.R
@@ -236,15 +236,9 @@ setMethod("datasheet",
     for (i in seq_along(name)) {
       n <- name[i]
       if (!grepl("_", n, fixed = TRUE)) {
-        l = ssimLibrary(.filepath(ssimObject), summary=T)
-        p = l$value[l$property == "Package Names:"][1] #TODO: test
-        n <- paste0(p, "_", n)
-      }
-
-      if (grepl("STSim_", n, fixed = TRUE)) {
-        warning("An STSim_ prefix for a datasheet name is no longer required.")
-        n <- paste0("stsim_", gsub("STSim_", "", n, fixed = TRUE))
+        stop("The datasheet name requires a package prefix (e.g., 'stsim_RunControl')")
       }
+
       name[i] <- n
     }
   }

diff --git a/R/internalHelpers.R b/R/internalHelpers.R
@@ -51,8 +51,7 @@ deleteDatasheet <- function(x, datasheet, datasheets, cProj = NULL, cScn = NULL,
     cName <- datasheet[j]
 
     if (!grepl("_", cName, fixed = TRUE)) {
-      pkg = lib$value[lib$property == "Package Names:"][1]
-      cName <- paste0(pkg, "_", cName)
+      stop("The datasheet name requires a package prefix (e.g., 'stsim_RunControl')")
     }
 
     cSheet <- subset(datasheets, name == cName)

diff --git a/R/saveDatasheet.R b/R/saveDatasheet.R
@@ -158,9 +158,7 @@ setMethod("saveDatasheet", signature(ssimObject = "SsimObject"), function(ssimOb
     }
 
     if (!grepl("_", name, fixed = )) {
-      l = ssimLibrary(.filepath(ssimObject), summary=T)
-      p = l$value[l$property == "Package Name:"][1] #TODO: test
-      name <- paste0(p, "_", name)
+      stop("The datasheet name requires a package prefix (e.g., 'stsim_RunControl')")
     }
 
     if (grepl("STSim_", name, fixed = TRUE)) {