'update'

[talweg.git] / pkg / R / utils.R

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index 0918a32..80a7e5d 100644 (file)
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -8,11 +8,10 @@
 #' @export
 dateIndexToInteger = function(index, data)
 {
-       index = index[1]
        if (is.numeric(index))
                index = as.integer(index)
        if (is.integer(index))
-               return (index)
+               return (index) #works on integers too: trust input
        if (inherits(index, "Date") || is.character(index))
        {
                tryCatch(indexAsDate <- as.Date(index), error=function(e) stop("Unrecognized index format"))
@@ -36,11 +35,13 @@ dateIndexToInteger = function(index, data)
 #' @export
 integerIndexToDate = function(index, data)
 {
+       if (is(index,"Date"))
+               return (index) #works on dates too: trust input
        index = index[1]
        if (is.numeric(index))
                index = as.integer(index)
        if (!is.integer(index))
-               stop("'index' should be an integer")
+               stop("'index' should be a date or integer")
        as.Date( data$getTime(index)[1] )
 }