Merge branch 'Guille' of medal.ctb.upm.es:uncover/harmonize_scripts into Guille

valid_variables_script2.R

@@ -187,7 +187,8 @@ check_values_format <- function(valid_columns, codebook_param){
           
           summary <- ds.summary(paste("inRange$", current_column, sep=""))
           if(ds.length(paste("data$", current_column, sep=""))[[1]] > summary[[1]][[2]]){
-            variables_out_of_range <- paste(variables_out_of_range, current_column, sep = " ")
+            variables_out_of_range <- paste(variables_out_of_range, current_column, "the range should be:" , possible_values ,sep = " ")
+            variables_out_of_range <- paste(variables_out_of_range , "" , sep = "\n")
             print(paste(current_column,  "does not follow the established format", sep=" "))
             print(paste("It should follow the following format: ", possible_values))
           }
@@ -219,7 +220,7 @@ check_values_format <- function(valid_columns, codebook_param){
               next
             if(!row_names[i] %in% value_format){
               variables_out_of_range <- paste(variables_out_of_range, current_column, "the range should be:" , possible_values ,sep = " ")
-              variables_out_of_range <- paste(variables_out_of_range , "\n" , sep = "")
+              variables_out_of_range <- paste(variables_out_of_range , "" , sep = "\n")
               print(paste(current_column,  "does not follow the established format", sep=" "))
               print(paste("It should follow the following format:", possible_values))
               print(paste("Instead of:", paste(row_names, collapse = " ")))
@@ -249,28 +250,6 @@ inp <- auxConnections[[2]]
  colnames <- ds.colnames("data")
  colnames
 
- # ds.dataFrameSubset(df.name = "data",
- #                    V1.name = "data$DMRAGEYR",
- #                    V2.name = "150",
- #                    Boolean.operator = "<=",
- #                    newobj = "inRangeHigh",
- #                    keep.NAs = TRUE,
- #                    datasources = connections)
- # 
- # ds.dataFrameSubset(df.name = "inRangeHigh",
- #                    V1.name = "inRangeHigh$DMRAGEYR",
- #                    V2.name = "0",
- #                    Boolean.operator = ">=",
- #                    newobj = "inRange",
- #                    keep.NAs = TRUE,
- #                    datasources = connections)
- # 
- # summary <- ds.summary("inRange$DMRAGEYR")
- # if(ds.length("data$DMRAGEYR")[[1]] > summary[[1]][[2]]){
- #   res <- c(res, paste(current_column,  "does not follow the established format" , sep="\n"))
- # }
-
-
 #----------------------------------------------------------------------------
 
 #Check valid column names
@@ -283,7 +262,7 @@ check_valid_columns <- check_column_names(codebook ,data_colnames)
 valid_columns <- as.data.frame(check_valid_columns$colnames)
 res <- ""
 res <- check_values_format(valid_columns, codebook)
-print(res)
+cat(res)
 
 datashield.logout(connections)