From bc496a8e20ca2810c0db5fffd6ca72f50a7286a4 Mon Sep 17 00:00:00 2001
From: Swen Vermeul <swen@ethz.ch>
Date: Tue, 26 Jul 2016 12:46:42 +0200
Subject: [PATCH] registration and modification date of spaces are formatted
---
src/python/PyBis/pybis/pybis.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/python/PyBis/pybis/pybis.py b/src/python/PyBis/pybis/pybis.py
index 527d3bc6401..7c10c3086f9 100644
--- a/src/python/PyBis/pybis/pybis.py
+++ b/src/python/PyBis/pybis/pybis.py
@@ -16,6 +16,7 @@ from requests.packages.urllib3.exceptions import InsecureRequestWarning
requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
import time
+from datetime import datetime
import json
import re
from urllib.parse import urlparse
@@ -213,6 +214,8 @@ class Openbis:
""" Get a list of all available spaces (DataFrame object). To create a sample or a
dataset, you need to specify in which space it should live.
"""
+ format_timestamp = lambda ts: datetime.fromtimestamp(round(ts/1000)).strftime('%Y-%m-%d %H:%M:%S')
+
if len(self.spaces) == 0 or refresh is not None:
request = {
"method": "searchSpaces",
@@ -222,7 +225,10 @@ class Openbis:
}
resp = self._post_request(self.as_v3, request)
if resp is not None:
- self.spaces = DataFrame(resp['objects'])[['code','description']]
+ spaces = DataFrame(resp['objects'])
+ spaces['registrationDate']= spaces['registrationDate'].map(format_timestamp)
+ spaces['modificationDate']= spaces['modificationDate'].map(format_timestamp)
+ self.spaces = spaces[['code', 'description', 'registrationDate', 'modificationDate']]
return self.spaces
else:
raise ValueError("No spaces found!")
--
GitLab