fix merge of recodes & labels

cturbelin · Dec 17, 2018 · c605fae · c605fae
1 parent 3cd1b11
commit c605fae
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/R/platform.R b/R/platform.R
@@ -156,11 +156,14 @@ create_survey_definition <- function( mapping, labels=NULL, codes=NULL, recodes=
       labels[[name]] <<- recodes[[name]]
     })
   }
+
   checks = NULL
+
   if( !is.null(template) ) {
     if( is.null(survey_templates[[template]]) ) {
       stop(paste0("Unknown template '", template,'"'))
     }
+
     template = survey_templates[[template]]
 
     checks = check_survey_template(template, mapping, recodes, only.errors = only.errors)
@@ -170,15 +173,18 @@ create_survey_definition <- function( mapping, labels=NULL, codes=NULL, recodes=
 
     # Merge recodes
     rr = list()
-    nn = unique(names(recodes), names(template$recodes))
+    nn = unique(c(names(recodes), names(template$recodes)))
     for(name in nn) {
       rr[[name]] = merge_by_value(recodes[[name]], template$recodes[[name]])
       if( !check_unique(rr[name]) ) {
         stop(paste0("Values are not unique for recode ", name))
       }
     }
     recodes = rr
-    rm(rr)
+
+    # Merge labels
+    labels = merge.list(labels, template$labels)
+
   }
 
   # Check if any mapping to protected names
@@ -257,6 +263,10 @@ check_survey_template <- function(template, mapping, recodes, only.errors=TRUE)
 #' @param errors list() errors generated by \code{\link{create_survey_definition}}
 #' @export
 print.survey_error = function(errors) {
+  if( length(errors)== 0 ) {
+    cat("No error")
+    return()
+  }
   cat("Error merging survey with template\n")
   rr = lapply(errors, function(e) {
     n = ""