updated unit lookup table

msorlien · msorlien · commit 9dc4f95b4fea · 2025-11-25T17:38:32.000-05:00
diff --git a/R/format_results.R b/R/format_results.R
@@ -96,7 +96,7 @@ format_results <- function(df, in_format, out_format, date_format = "m/d/Y",
   } else {
     df <- dplyr::select(df, dplyr::all_of(c(keep_col, drop_col)))
     message(
-      "\tRetaining ", toString(length(drop_col)), " surplus columns"
+      "\tKept ", toString(length(drop_col)), " extra columns"
     )
   }
 
diff --git a/R/format_sites.R b/R/format_sites.R
@@ -77,7 +77,7 @@ format_sites <- function(df, in_format, out_format, drop_extra_col = TRUE) {
   } else {
     df <- dplyr::select(df, dplyr::all_of(c(keep_col, drop_col)))
     message(
-      "\tRetaining ", toString(length(drop_col)), " surplus columns"
+      "\tKept ", toString(length(drop_col)), " extra columns"
     )
   }
 
diff --git a/R/sysdata.rda b/R/sysdata.rda
diff --git a/data-raw/varnames_units.csv b/data-raw/varnames_units.csv
@@ -5,7 +5,7 @@ wqx,masswater,ri_dem,ma_brc,me_dep,me_focb
 AU,AU,,,,
 cfm,cfm,,,,
 cfs|ft3/sec,cfs,cfs,,,
-cfu/100mL|cfu/100ml|#col/100mL|#col/100ml,cfu/100ml,CFU/100ml|CFU/100mL,,,
+cfu/100mL|cfu/100ml|#col/100mL|#col/100ml,cfu/100ml,CFU/100ml|CFU/100mL|CFU/100,,,
 cm,cm,,,,
 deg C,deg C,C|c,C,DEG C,Deg C|DEG C
 deg F,deg F,F|f,,,
diff --git a/inst/extdata/varnames_units.csv b/inst/extdata/varnames_units.csv
@@ -5,7 +5,7 @@ wqx,masswater,ri_dem,ma_brc,me_dep,me_focb,wqdashboard,ri_ww
 AU,AU,,,,,AU,
 cfm,cfm,,,,,cfm,
 cfs|ft3/sec,cfs,cfs,,,,cfs|ft3/sec,cfs
-cfu/100mL|cfu/100ml|#col/100mL|#col/100ml,cfu/100ml,CFU/100ml|CFU/100mL,,,,cfu/100mL|cfu/100ml|#col/100mL|#col/100ml,CFU/100ml|CFU/100mL
+cfu/100mL|cfu/100ml|#col/100mL|#col/100ml,cfu/100ml,CFU/100ml|CFU/100mL|CFU/100,,,,cfu/100mL|cfu/100ml|#col/100mL|#col/100ml,CFU/100ml|CFU/100mL|CFU/100
 cm,cm,,,,,cm,
 deg C,deg C,C|c,C,DEG C,Deg C|DEG C,deg C,C|c
 deg F,deg F,F|f,,,,deg F,F|f

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ format_results <- function(df, in_format, out_format, date_format = "m/d/Y",`
`96`	`96`	`} else {`
`97`	`97`	`df <- dplyr::select(df, dplyr::all_of(c(keep_col, drop_col)))`
`98`	`98`	`message(`
`99`		`- "\tRetaining ", toString(length(drop_col)), " surplus columns"`
	`99`	`+ "\tKept ", toString(length(drop_col)), " extra columns"`
`100`	`100`	`)`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ format_sites <- function(df, in_format, out_format, drop_extra_col = TRUE) {`
`77`	`77`	`} else {`
`78`	`78`	`df <- dplyr::select(df, dplyr::all_of(c(keep_col, drop_col)))`
`79`	`79`	`message(`
`80`		`- "\tRetaining ", toString(length(drop_col)), " surplus columns"`
	`80`	`+ "\tKept ", toString(length(drop_col)), " extra columns"`
`81`	`81`	`)`
`82`	`82`	`}`
`83`	`83`