From 3886bd4c77bdbf6647406c2409af04d44562aace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Fri, 21 Aug 2015 10:58:09 +0200 Subject: [PATCH] Progress --- Readme.md | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index 7718fb9..f91b936 100644 --- a/Readme.md +++ b/Readme.md @@ -228,7 +228,7 @@ Following examples build on a waveform data (see below). They also work for scal ### Query Examples -##### Query by Pulse-Id +##### Query by Pulse-Id Range ``` { @@ -240,7 +240,7 @@ Following examples build on a waveform data (see below). They also work for scal } ``` -###### Example +###### Command ```bash curl -H "Content-Type: application/json" -X POST -d '{"startPulseId":0,"endPulseId":3,"channels":["Channel_01"]}' http://sf-nube-14.psi.ch:8080/query @@ -252,7 +252,7 @@ See JSON representation of the data above. -##### Query by Time +##### Query by Time Range ``` { @@ -266,7 +266,7 @@ See JSON representation of the data above. } ``` -###### Example +###### Command ```bash curl -H "Content-Type: application/json" -X POST -d '{"startMillis":0,"startNanos":0,"endMillis":30,"endNanos":999999,"channels":["Channel_01"]}' http://sf-nube-14.psi.ch:8080/query @@ -278,7 +278,7 @@ See JSON representation of the data above. -##### Query by Date +##### Query by Date Range ``` { @@ -292,7 +292,39 @@ See JSON representation of the data above. } ``` -###### Example +Supported formats: *yyyy/MM/dd HH:mm:ss.SSS* and *dd.MM.yyyy HH:mm:ss.SSS* + +###### Command + +```bash +curl -H "Content-Type: application/json" -X POST -d '{"startDate":"1970/01/01 01:00:00.000","startNanos":0,"endDate":"1970/01/01 01:00:00.030","endNanos":999999,"channels":["Channel_01"]}' http://sf-nube-14.psi.ch:8080/query +``` + +###### Response + +See JSON representation of the data above. + + + +##### Querying Archiver Appliance + +``` +{ + "startMillis":0, + "startNanos":0, + "endMillis":30, + "endNanos":999999, + "dbmode":"archiverappliance", + "channels":[ + "Channel_01" + ] +} +``` + +Archiver Appliance supports queries by *time range* and *date range* only (as it has no notion about pulse-id). + + +###### Command ```bash curl -H "Content-Type: application/json" -X POST -d '{"startDate":"1970/01/01 01:00:00.000","startNanos":0,"endDate":"1970/01/01 01:00:00.030","endNanos":999999,"channels":["Channel_01"]}' http://sf-nube-14.psi.ch:8080/query