diff options
| -rw-r--r-- | R/serenitasdb.R | 4 | ||||
| -rw-r--r-- | python/globeop.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/R/serenitasdb.R b/R/serenitasdb.R index efdae6fe..b79233f7 100644 --- a/R/serenitasdb.R +++ b/R/serenitasdb.R @@ -146,8 +146,8 @@ get.indexquotes <- function(indexname, tenor){ } get.skews <- function(indexname, tenor){ - stmt <- "select skew from risk_numbers where index=$1 and series=$2 and tenor=$3 order by date" - arr <- with(indexplit(indexname), + stmt <- "select date, skew from risk_numbers where index=$1 and series=$2 and tenor=$3 order by date" + arr <- with(indexsplit(indexname), dbGetQuery(serenitasdb, stmt, params=list(indextype, series, tenor))) arr <- arr.convert(arr$skew) return ( arr[,-ncol(arr)] ) diff --git a/python/globeop.py b/python/globeop.py index b3b60c80..a5afbe3e 100644 --- a/python/globeop.py +++ b/python/globeop.py @@ -16,12 +16,12 @@ group.add_argument("-d", "--download", action="store_true", help="download reports from GlobeOp") group.add_argument("-u", "--upload", action="store_true", help="upload marks to GlobeOp") -parser.add_argument("date", nargs='?', type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d").date(), - default=datetime.date.today()) +parser.add_argument("date", nargs='?', type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"), + default=datetime.datetime.today()) args = parser.parse_args() if args.download: - download_data(args.date) + download_data(args.date.date()) elif args.upload: engine = create_engine('postgresql://dawn_user@debian/dawndb') upload_data(engine, args.date) |