Fix negative signs on table labels for categorical array and multiple…

… response variables
Crunch-io · Oct 20, 2022 · 982a571 · 982a571
1 parent 7a4028b
commit 982a571
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -28,6 +28,7 @@ Imports:
     methods,
     openxlsx,
     rlang,
+    stringr,
     tinytex
 Suggests:
     arrow,

diff --git a/NAMESPACE b/NAMESPACE
@@ -39,6 +39,9 @@ S3method(tableHeader,CrossTabVar)
 S3method(tableHeader,ToplineCategoricalArray)
 S3method(tableHeader,ToplineVar)
 S3method(tableHeader,default)
+export(adjustCrunchAlias)
+export(adjustCrunchDescription)
+export(adjustCrunchName)
 export(banner)
 export(catArrayToCategoricals)
 export(codeBookItemBody)
@@ -106,6 +109,7 @@ importFrom(stats,median)
 importFrom(stats,pnorm)
 importFrom(stats,quantile)
 importFrom(stats,weighted.mean)
+importFrom(stringr,str_extract)
 importFrom(utils,capture.output)
 importFrom(utils,head)
 importFrom(utils,installed.packages)

diff --git a/R/codeBookItemBody.R b/R/codeBookItemBody.R
@@ -125,14 +125,15 @@ codeBookItemBody.CategoricalVariable <- function(x, meta = NULL, ...) { # nolint
 }
 
 #' @describeIn codeBookItemBody Creates item body for CategoricalArrayVariable
+#' @importFrom stringr str_extract
 #' @export
 codeBookItemBody.CategoricalArrayVariable <- function(x, meta = NULL, ...) { # nolint
   k <- codeBookSummary(x)
   k[, 1] <- texEscape(k[, 1])
   k[, 2] <- texEscape(k[, 2])
 
-  code_labels <- texEscape(gsub("[0-9]+ ", "", names(k))[-c(1, 2)])
-  code_numbers <- trimws(sub("\\D*(\\d+).*", "\\1", names(k)))[-c(1, 2)]
+  code_labels <- texEscape(gsub("^-?[0-9]+ ", "", names(k))[-c(1, 2)])
+  code_numbers <- trimws(stringr::str_extract(names(k), "^-?[0-9]*"))[-c(1, 2)]
 
   rownames(k) <- NULL