Commit 67b26718 authored by Jerome Touvier's avatar Jerome Touvier
Browse files

Merge branch 'fix' into 'master'

fix doc

See merge request !25
parents 1de3d80d e534c7be
Pipeline #55582 passed with stage
in 40 seconds
......@@ -13,7 +13,7 @@ This service provides access to the RESIF-DC statistics.
date-options :: [starttime=<date>] & [endtime=<date>]
storage-options :: [year=<year>] & [type=<all|bud|validated>]
send-options :: [country=<country_code>] & [media=<all|dataselect|seedlink>]
output-options :: [format=<csv|request|sync|text>]
output-options :: [format=<csv|text>]
(..) required
[..] optional
......
......@@ -13,7 +13,7 @@ Ce service donne accès aux statistiques de RESIF-DC.
date-options :: [starttime=<date>] & [endtime=<date>]
storage-options :: [year=<year>] & [type=<all|bud|validated>]
send-options :: [country=<country_code>] & [media=<all|dataselect|seedlink>]
output-options :: [format=<csv|request|sync|text>]
output-options :: [format=<csv|text>]
(..) requis
[..] optionnel
......
......@@ -25,12 +25,12 @@
où :
request-options :: (request=&lt;country|send|storage|timeseries&gt;)
request-options :: (request=&lt;country|map|send|storage|timeseries&gt;)
channel-options :: [net=&lt;network&gt; &amp; sta=&lt;station&gt; &amp; loc=&lt;location&gt; &amp; cha=&lt;channel&gt;]
date-options :: [starttime=&lt;date&gt;] &amp; [endtime=&lt;date&gt;]
storage-options :: [year=&lt;year&gt;] &amp; [type=&lt;all|bud|validated&gt;]
send-options :: [country=&lt;country_code&gt;] &amp; [media=&lt;all|dataselect|seedlink&gt;]
output-options :: [format=&lt;csv|request|sync|text&gt;]
output-options :: [format=&lt;csv|text&gt;]
(..) requis
[..] optionnel</code></pre>
......@@ -38,7 +38,7 @@ output-options :: [format=&lt;csv|request|sync|text&gt;]
<p><a href="http://ws.resif.fr/resifws/statistics/1/query?request=storage&net=FR&year=2018&type=validated">http://ws.resif.fr/resifws/statistics/1/query?request=storage&amp;net=FR&amp;year=2018&amp;type=validated</a></p>
<p><a href="http://ws.resif.fr/resifws/statistics/1/query?request=send&media=dataselect&net=WI&country=IT">http://ws.resif.fr/resifws/statistics/1/query?request=send&amp;media=dataselect&amp;net=WI&amp;country=IT</a></p>
<p><a href="http://ws.resif.fr/resifws/statistics/1/query?request=country&media=dataselect&net=RA&country=IT,US,FR">http://ws.resif.fr/resifws/statistics/1/query?request=country&amp;media=dataselect&amp;net=RA&amp;country=IT,US,FR</a></p>
<p><a href="http://ws.resif.fr/resifws/statistics/1/query?request=country&media=seedlink&net=RA&starttime=2020-01-01">http://ws.resif.fr/resifws/statistics/1/query?request=country&amp;media=seedlink&amp;net=RA&amp;starttime=2020-01-01</a></p>
<p><a href="http://ws.resif.fr/resifws/statistics/1/query?request=map&media=dataselect&starttime=2020-01-01">http://ws.resif.fr/resifws/statistics/1/query?request=map&amp;media=dataselect&amp;starttime=2020-01-01</a></p>
<h2 id="descriptions-détaillées-de-chaque-paramètre-de-la-requête">Descriptions détaillées de chaque paramètre de la requête</h2>
<table>
<colgroup>
......
......@@ -25,12 +25,12 @@
where :
request-options :: (request=&lt;country|send|storage|timeseries&gt;)
request-options :: (request=&lt;country|map|send|storage|timeseries&gt;)
channel-options :: [net=&lt;network&gt; &amp; sta=&lt;station&gt; &amp; loc=&lt;location&gt; &amp; cha=&lt;channel&gt;]
date-options :: [starttime=&lt;date&gt;] &amp; [endtime=&lt;date&gt;]
storage-options :: [year=&lt;year&gt;] &amp; [type=&lt;all|bud|validated&gt;]
send-options :: [country=&lt;country_code&gt;] &amp; [media=&lt;all|dataselect|seedlink&gt;]
output-options :: [format=&lt;csv|request|sync|text&gt;]
output-options :: [format=&lt;csv|text&gt;]
(..) required
[..] optional</code></pre>
......@@ -39,6 +39,7 @@ output-options :: [format=&lt;csv|request|sync|text&gt;]
<p><a href="http://ws.resif.fr/resifws/statistics/1/query?request=send&media=dataselect&net=WI&country=IT">http://ws.resif.fr/resifws/statistics/1/query?request=send&amp;media=dataselect&amp;net=WI&amp;country=IT</a></p>
<p><a href="http://ws.resif.fr/resifws/statistics/1/query?request=country&media=dataselect&net=RA&country=IT,US,FR">http://ws.resif.fr/resifws/statistics/1/query?request=country&amp;media=dataselect&amp;net=RA&amp;country=IT,US,FR</a></p>
<p><a href="http://ws.resif.fr/resifws/statistics/1/query?request=country&media=seedlink&net=RA&starttime=2020-01-01">http://ws.resif.fr/resifws/statistics/1/query?request=country&amp;media=seedlink&amp;net=RA&amp;starttime=2020-01-01</a></p>
<p><a href="http://ws.resif.fr/resifws/statistics/1/query?request=map&media=dataselect&starttime=2020-01-01">http://ws.resif.fr/resifws/statistics/1/query?request=map&amp;media=dataselect&amp;starttime=2020-01-01</a></p>
<h2 id="detailed-descriptions-of-each-query-parameter">Detailed descriptions of each query parameter</h2>
<table>
<colgroup>
......
......@@ -63,8 +63,6 @@
<param name="nodata" style="query" type="xsd:string"/>
<param name="format" style="query" type="xsd:string">
<option value="csv"/>
<option value="request"/>
<option value="sync"/>
<option value="text"/>
</param>
</request>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment