Merge pull request #151 from RobLBaker/main

bugfix for test_storage_type

NEWS.md

@@ -1,4 +1,7 @@
 # DPchecker 0.3.5 (develoment version)
+## 2024-011-05
+* Bugfix for `test_storage_type()` data packages built in ezEML that have only 1 .csv file.
+
 * Add `test_project()` function to test for DataStore projects.
 * Add unit tests for all optional eml elements
 * Update documentation to reflect new `test_project()` function.

R/required_eml_elements.R

@@ -608,30 +608,41 @@ test_storage_type <- function(metadata = load_metadata(directory)) {
                       function (tbl)
                       {list(arcticdatautils::eml_get_simple(tbl,
                                                             "storageType"))})
-  #if EZeml added typeSystem="XML Schema Datatypes" to storageType element:
-  if(sum(grepl("XML Schema Datatype", attr_storage_type)) > 0){
-    attr_storage_type <-attr_storage_type[-length(seq_along(attr_storage_type))]
+  #if ezEML with multiple .csv (remove typeSystem="XML Schema Datatypes"):
+  if (sum(grepl("XML Schema Datatype", attr_storage_type)) > 1) {
+    attr_storage_type <- attr_storage_type[-length(seq_along(attr_storage_type))]
+    attr_storage_type <- unlist(attr_storage_type)
+    attr_storage_type <- attr_storage_type[names(attr_storage_type) %in% c("")]
+  }
+  # if ezEML with only one .csv (remove typeSystem= "XML Schema Datatypes":
+  else if (sum(grepl("XML Schema Datatype", attr_storage_type)) == 1) {
     attr_storage_type <- unlist(attr_storage_type)
     attr_storage_type <- attr_storage_type[names(attr_storage_type) %in% c("")]
   }
   # else not an ezEML product:
-  else{
+  else {
     attr_storage_type$`@context` <- NULL
     attr_storage_type <- unlist(attr_storage_type)
   }
 
   #comparisons:
-  if(identical(seq_along(metadata_attrs), seq_along(attr_storage_type))){
+  if (identical(seq_along(metadata_attrs), seq_along(attr_storage_type))) {
     cli::cli_inform(c("v" = "All attributes listed in metadata have a storage type associated with them."))
   }
   else {
     cli::cli_abort(c("x" = "Metadata attribute and storage type mis-match: attributes must have exactly one storage type."))
   }
-  attr_storage_list <- c("string", "float", "date", "factor", "character", "dateTime")
-  if(sum(!attr_storage_type %in% attr_storage_list) > 0){
+  attr_storage_list <- c("string",
+                         "float",
+                         "date",
+                         "factor",
+                         "character",
+                         "dateTime",
+                         "integer")
+  if (sum(!attr_storage_type %in% attr_storage_list) > 0) {
     cli::cli_warn(c("!" = "Some attribute storage types are not accepted values."))
   }
-  else{
+  else {
     cli::cli_inform(c("v" = "All attribute storage types are valid values."))
   }
   return(invisible(metadata))

docs/pkgdown.yml

@@ -3,4 +3,4 @@ pkgdown: 2.1.0
 pkgdown_sha: ~
 articles:
   DPchecker: DPchecker.html
-last_built: 2024-09-19T19:20Z
+last_built: 2024-11-05T22:12Z