minor bug-fixes

metno · Nov 8, 2023 · caf4dba · caf4dba
1 parent 0e0a916
commit caf4dba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ocdp/app/global.R b/ocdp/app/global.R
@@ -243,12 +243,12 @@ vari2name <- function(x,vars=c('pre','t2m','tmax','tmin',
  'Global Radiation','Humidity'),nc=3) {
  print(paste('<D: vari2name',x,collapse=' '))
  x <- sub('slp','pp',x)
- x <- sub('precip','rr',x)
+ x <- sub('precip','pre',x)
  if (length(vars) != length(vnames)) { 
  print(vars); print(vnames)
  stop("vars have different length to vnames in 'variname'")
  }
- y <- vnames[match(x,vars)]
+ y <- vnames[match(tolower(substr(x,1,4)),vars)]
  print(paste(y,'...D>',collapse=' '))
  return(y)
 }

diff --git a/ocdp/app/server.R b/ocdp/app/server.R
@@ -346,8 +346,8 @@ server <- function(input, output, session) {
  print('<17: reactive - updateci()')
  varids <- updatevarids()
  ci <- 1:length(varids); names.ci <- names(varids)
- ## In case the vairable is missing in our list
- names.ci[is.na(names.ci)] <- toupper(varids[is.na(names.ci)])
+ ## In case the variable is missing in our list
+ names.ci[is.na(names.ci)] <- vari2name(varids[is.na(names.ci)])
  #print(names.ci)
  names(ci) <- names.ci
  return(ci)